diff --git a/src/config.c b/src/config.c
index b9b9adb5..3a3ccc14 100644
--- a/src/config.c
+++ b/src/config.c
@@ -912,7 +912,7 @@ void cfg_assign(char *sp, int strct, Component_t *cp, VALUE *v) {
         cp->name, cfg_strct_name(strct), cfg_comp_type(cp->type), cfg_v_type(v->type));
       return;
     }
-    // TODO: consider endianess (code currently assumes little endian)
+    // TODO: consider endianness (code currently assumes little endian)
     num = v->number;
     memcpy(sp+cp->offset, &num, cp->size);
     break;
diff --git a/src/fileio.c b/src/fileio.c
index 694af668..be6b303e 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -857,16 +857,16 @@ static int elf2b(const char *infile, FILE *inf, const AVRMEM *mem,
   }
 
   const char *endianname;
-  unsigned char endianess;
+  unsigned char endianness;
   if (p->prog_modes & PM_aWire) { // AVR32
-    endianess = ELFDATA2MSB;
+    endianness = ELFDATA2MSB;
     endianname = "little";
   } else {
-    endianess = ELFDATA2LSB;
+    endianness = ELFDATA2LSB;
     endianname = "big";
   }
   if (id[EI_CLASS] != ELFCLASS32 ||
-      id[EI_DATA] != endianess) {
+      id[EI_DATA] != endianness) {
     pmsg_error("ELF file %s is not a 32-bit, %s-endian file that was expected\n",
       infile, endianname);
     goto done;
diff --git a/src/jtagmkII_private.h b/src/jtagmkII_private.h
index f567ce73..d3aec68b 100644
--- a/src/jtagmkII_private.h
+++ b/src/jtagmkII_private.h
@@ -335,7 +335,7 @@ typedef enum
  * In appnote AVR067, struct device_descriptor is written with
  * int/long field types.  We cannot use them directly, as they were
  * neither properly aligned for portability, nor did they care for
- * endianess issues.  We thus use arrays of unsigned chars, plus
+ * endianness issues.  We thus use arrays of unsigned chars, plus
  * conversion macros.
  */
 struct device_descriptor
diff --git a/src/term.c b/src/term.c
index 4ee0bc73..66caa74f 100644
--- a/src/term.c
+++ b/src/term.c
@@ -522,7 +522,7 @@ static int cmd_write(const PROGRAMMER *pgm, const AVRPART *p, int argc, const ch
       }
       if(sd->warnstr)
         pmsg_warning("(write) %s\n", sd->warnstr);
-      // Always write little endian (assume double and int have same endianess)
+      // Always write little endian (assume double and int have same endianness)
       if(is_bigendian() && sd->size > 0 && (sd->type & STR_NUMBER))
         change_endian(sd->a, sd->size);
     } else {