diff --git a/Grbl_Esp32/src/CoolantControl.cpp b/Grbl_Esp32/src/CoolantControl.cpp
index 6d03dfba..9f4016e8 100644
--- a/Grbl_Esp32/src/CoolantControl.cpp
+++ b/Grbl_Esp32/src/CoolantControl.cpp
@@ -1,5 +1,5 @@
 /*
-  CoolantControl.c - coolant control methods
+  CoolantControl.cpp - coolant control methods
   Part of Grbl
 
   Copyright (c) 2012-2016 Sungeun K. Jeon for Gnea Research LLC
diff --git a/Grbl_Esp32/src/GCode.cpp b/Grbl_Esp32/src/GCode.cpp
index b35c655f..2b7bbaf0 100644
--- a/Grbl_Esp32/src/GCode.cpp
+++ b/Grbl_Esp32/src/GCode.cpp
@@ -1,5 +1,5 @@
 /*
-  GCode.c - rs274/ngc parser.
+  GCode.cpp - rs274/ngc parser.
   Part of Grbl
 
   Copyright (c) 2011-2016 Sungeun K. Jeon for Gnea Research LLC
diff --git a/Grbl_Esp32/src/GCode.h b/Grbl_Esp32/src/GCode.h
index 3d1b8cdd..70dbe62b 100644
--- a/Grbl_Esp32/src/GCode.h
+++ b/Grbl_Esp32/src/GCode.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /*
-  Gcode.h - rs274/ngc parser.
+  GCode.h - rs274/ngc parser.
   Part of Grbl
 
   Copyright (c) 2011-2015 Sungeun K. Jeon
diff --git a/Grbl_Esp32/src/Jog.cpp b/Grbl_Esp32/src/Jog.cpp
index c345cf86..b3eb4917 100644
--- a/Grbl_Esp32/src/Jog.cpp
+++ b/Grbl_Esp32/src/Jog.cpp
@@ -1,5 +1,5 @@
 /*
-  Jog.h - Jogging methods
+  Jog.cpp - Jogging methods
   Part of Grbl
 
   Copyright (c) 2016 Sungeun K. Jeon for Gnea Research LLC
diff --git a/Grbl_Esp32/src/MotionControl.cpp b/Grbl_Esp32/src/MotionControl.cpp
index 4958a337..b9d5f22a 100644
--- a/Grbl_Esp32/src/MotionControl.cpp
+++ b/Grbl_Esp32/src/MotionControl.cpp
@@ -1,5 +1,5 @@
 /*
-  MotionControl.c - high level interface for issuing motion commands
+  MotionControl.cpp - high level interface for issuing motion commands
   Part of Grbl
 
   Copyright (c) 2011-2016 Sungeun K. Jeon for Gnea Research LLC
@@ -240,7 +240,7 @@ void mc_homing_cycle(uint8_t cycle_mask) {
 #endif
         // Check and abort homing cycle, if hard limits are already enabled. Helps prevent problems
         // with machines with limits wired on both ends of travel to one limit pin.
-        // TODO: Move the pin-specific LIMIT_PIN call to limits.c as a function.
+        // TODO: Move the pin-specific LIMIT_PIN call to Limits.cpp as a function.
 #ifdef LIMITS_TWO_SWITCHES_ON_AXES
     if (limits_get_state()) {
         mc_reset();  // Issue system reset and ensure spindle and coolant are shutdown.
diff --git a/Grbl_Esp32/src/Motors/TrinamicDriver.h b/Grbl_Esp32/src/Motors/TrinamicDriver.h
index 6fc492d0..c4f7df95 100644
--- a/Grbl_Esp32/src/Motors/TrinamicDriver.h
+++ b/Grbl_Esp32/src/Motors/TrinamicDriver.h
@@ -5,7 +5,7 @@
 
     Part of Grbl_ESP32
 
-    Copyright 2020 -	Bart Dring
+    2020 -	Bart Dring
 
     Grbl is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/Grbl_Esp32/src/NutsBolts.cpp b/Grbl_Esp32/src/NutsBolts.cpp
index 7333a53d..8420da94 100644
--- a/Grbl_Esp32/src/NutsBolts.cpp
+++ b/Grbl_Esp32/src/NutsBolts.cpp
@@ -1,5 +1,5 @@
 /*
-  NutsBolts.c - Shared functions
+  NutsBolts.cpp - Shared functions
   Part of Grbl
 
   Copyright (c) 2011-2016 Sungeun K. Jeon for Gnea Research LLC
diff --git a/Grbl_Esp32/src/Planner.cpp b/Grbl_Esp32/src/Planner.cpp
index a3fcb77f..05bd2bae 100644
--- a/Grbl_Esp32/src/Planner.cpp
+++ b/Grbl_Esp32/src/Planner.cpp
@@ -1,5 +1,5 @@
 /*
-  Planner.c - buffers movement commands and manages the acceleration profile plan
+  Planner.cpp - buffers movement commands and manages the acceleration profile plan
   Part of Grbl
 
   Copyright (c) 2011-2016 Sungeun K. Jeon for Gnea Research LLC
diff --git a/Grbl_Esp32/src/Probe.cpp b/Grbl_Esp32/src/Probe.cpp
index 35e3b47f..5ece4a01 100644
--- a/Grbl_Esp32/src/Probe.cpp
+++ b/Grbl_Esp32/src/Probe.cpp
@@ -1,5 +1,5 @@
 /*
-  Probe.c - code pertaining to probing methods
+  Probe.cpp - code pertaining to probing methods
   Part of Grbl
 
   Copyright (c) 2014-2016 Sungeun K. Jeon for Gnea Research LLC
diff --git a/Grbl_Esp32/src/Protocol.cpp b/Grbl_Esp32/src/Protocol.cpp
index f18e29a1..56f9fd2c 100644
--- a/Grbl_Esp32/src/Protocol.cpp
+++ b/Grbl_Esp32/src/Protocol.cpp
@@ -1,5 +1,5 @@
 /*
-  Protocol.c - controls Grbl execution protocol and procedures
+  Protocol.cpp - controls Grbl execution protocol and procedures
   Part of Grbl
 
   Copyright (c) 2011-2016 Sungeun K. Jeon for Gnea Research LLC
diff --git a/Grbl_Esp32/src/Report.cpp b/Grbl_Esp32/src/Report.cpp
index 8ed8b35d..19c98eda 100644
--- a/Grbl_Esp32/src/Report.cpp
+++ b/Grbl_Esp32/src/Report.cpp
@@ -1,5 +1,5 @@
 /*
-  Report.c - reporting and messaging methods
+  Report.cpp - reporting and messaging methods
   Part of Grbl
 
   Copyright (c) 2012-2016 Sungeun K. Jeon for Gnea Research LLC
@@ -24,7 +24,7 @@
 /*
   This file functions as the primary feedback interface for Grbl. Any outgoing data, such
   as the protocol status messages, feedback messages, and status reports, are stored here.
-  For the most part, these functions primarily are called from protocol.c methods. If a
+  For the most part, these functions primarily are called from Protocol.cpp methods. If a
   different style feedback is desired (i.e. JSON), then a user can change these following
   methods to accommodate their needs.
 
diff --git a/Grbl_Esp32/src/SettingsStorage.cpp b/Grbl_Esp32/src/SettingsStorage.cpp
index c4537958..cec5d164 100644
--- a/Grbl_Esp32/src/SettingsStorage.cpp
+++ b/Grbl_Esp32/src/SettingsStorage.cpp
@@ -1,5 +1,5 @@
 /*
-  SettingsStorage.c - EEPROM configuration handling
+  SettingsStorage.cpp - EEPROM configuration handling
   Part of Grbl
 
   Copyright (c) 2011-2016 Sungeun K. Jeon for Gnea Research LLC
diff --git a/Grbl_Esp32/src/Stepper.cpp b/Grbl_Esp32/src/Stepper.cpp
index d8871906..f64caa8d 100644
--- a/Grbl_Esp32/src/Stepper.cpp
+++ b/Grbl_Esp32/src/Stepper.cpp
@@ -1,5 +1,5 @@
 /*
-  Stepper.c - stepper motor driver: executes motion plans using stepper motors
+  Stepper.cpp - stepper motor driver: executes motion plans using stepper motors
   Part of Grbl
 
   Copyright (c) 2011-2016 Sungeun K. Jeon for Gnea Research LLC