diff --git a/src/RowIOE.cpp b/src/Row_IOE.cpp
similarity index 92%
rename from src/RowIOE.cpp
rename to src/Row_IOE.cpp
index a020332..714a615 100644
--- a/src/RowIOE.cpp
+++ b/src/Row_IOE.cpp
@@ -1,9 +1,9 @@
-#include "RowIOE.h"
+#include "Row_IOE.h"
 
 /*
 process() scans the row and calls any newly pressed or released keys.
 */
-void RowIOE::process()
+void Row_IOE::process()
 {
     //these variables are all bitwise, one bit per key
     uint8_t rowState;                           //1 means pressed, 0 means released
diff --git a/src/RowIOE.h b/src/Row_IOE.h
similarity index 84%
rename from src/RowIOE.h
rename to src/Row_IOE.h
index 13e00e2..c9752a4 100644
--- a/src/RowIOE.h
+++ b/src/Row_IOE.h
@@ -14,13 +14,13 @@ Configuration
 Instantiation
 -------------
 */
-class RowIOE : public RowBase
+class Row_IOE : public RowBase
 {
     private:
         RowScanner_PinsBitwise scanner;
         Debouncer_4Samples debouncer;
     public:
-        RowIOE( RowPort& refRowPort, const uint8_t strobePin,
+        Row_IOE( RowPort& refRowPort, const uint8_t strobePin,
              ColPort& refColPort, Key *const ptrsKeys[])
             : RowBase(ptrsKeys), scanner(refRowPort, strobePin, refColPort) { }
         virtual void process();
diff --git a/src/Row.cpp b/src/Row_uC.cpp
similarity index 92%
rename from src/Row.cpp
rename to src/Row_uC.cpp
index 1e6abe4..6da513b 100644
--- a/src/Row.cpp
+++ b/src/Row_uC.cpp
@@ -1,9 +1,9 @@
-#include "Row.h"
+#include "Row_uC.h"
 
 /*
 process() scans the row and calls any newly pressed or released keys.
 */
-void Row::process()
+void Row_uC::process()
 {
     //these variables are all bitwise, one bit per key
     uint8_t rowState;                           //1 means pressed, 0 means released
diff --git a/src/Row.h b/src/Row_uC.h
similarity index 69%
rename from src/Row.h
rename to src/Row_uC.h
index 2e83df6..60d1236 100644
--- a/src/Row.h
+++ b/src/Row_uC.h
@@ -11,16 +11,15 @@ Configuration
 
 Instantiation
 -------------
- todo - see Row_DH
+ todo - see RowDH
 */
-class Row : public RowBase
+class Row_uC : public RowBase
 {
     private:
         RowScanner_PinsArray scanner;
         Debouncer_4Samples debouncer;
     public:
-        //Row constructor was like Row_DH constructor
-        Row(const uint8_t strobePin, const uint8_t readPins[], const uint8_t READ_PIN_COUNT,
+        Row_uC(const uint8_t strobePin, const uint8_t readPins[], const uint8_t READ_PIN_COUNT,
                 Key *const ptrsKeys[])
             : RowBase(ptrsKeys), scanner(strobePin, readPins, READ_PIN_COUNT) { }
         virtual void process();