diff --git a/src/lcd/CMakeLists.txt b/src/lcd/CMakeLists.txt
index 476653b4..f27b55a7 100644
--- a/src/lcd/CMakeLists.txt
+++ b/src/lcd/CMakeLists.txt
@@ -1,5 +1,5 @@
 set (libname "i2clcd")
 set (libdescription "upm lcd/oled displays")
-set (module_src i2clcd.cxx lcm1602.cxx jhd1313m1.cxx ssd1308.cxx ssd1327.cxx)
-set (module_h i2clcd.h lcm1602.h jhd1313m1.h ssd1308.h ssd1327.h ssd.h)
+set (module_src lcd.cxx lcm1602.cxx jhd1313m1.cxx ssd1308.cxx ssd1327.cxx)
+set (module_h lcd.h lcm1602.h jhd1313m1.h ssd1308.h ssd1327.h ssd.h)
 upm_module_init()
diff --git a/src/lcd/jhd1313m1.cxx b/src/lcd/jhd1313m1.cxx
index bac54946..32edecaf 100644
--- a/src/lcd/jhd1313m1.cxx
+++ b/src/lcd/jhd1313m1.cxx
@@ -26,7 +26,7 @@
 #include <stdexcept>
 #include <unistd.h>
 
-#include "i2clcd_private.h"
+#include "lcd_private.h"
 #include "jhd1313m1.h"
 
 using namespace upm;
diff --git a/src/lcd/jhd1313m1.h b/src/lcd/jhd1313m1.h
index 77c4165e..66e26b70 100644
--- a/src/lcd/jhd1313m1.h
+++ b/src/lcd/jhd1313m1.h
@@ -24,7 +24,7 @@
 #pragma once
 
 #include <string>
-#include "i2clcd.h"
+#include "lcd.h"
 
 namespace upm
 {
diff --git a/src/lcd/jsupm_i2clcd.i b/src/lcd/jsupm_i2clcd.i
index 530fc8ef..af0b4d07 100644
--- a/src/lcd/jsupm_i2clcd.i
+++ b/src/lcd/jsupm_i2clcd.i
@@ -9,9 +9,9 @@
 }
 
 %include "ssd.h"
-%include "i2clcd.h"
+%include "lcd.h"
 %{
-    #include "i2clcd.h"
+    #include "lcd.h"
 %}
 
 %include "jhd1313m1.h"
diff --git a/src/lcd/i2clcd.cxx b/src/lcd/lcd.cxx
similarity index 97%
rename from src/lcd/i2clcd.cxx
rename to src/lcd/lcd.cxx
index 035d1508..50ffbe83 100644
--- a/src/lcd/i2clcd.cxx
+++ b/src/lcd/lcd.cxx
@@ -25,8 +25,8 @@
 #include <iostream>
 #include <unistd.h>
 
-#include "i2clcd.h"
-#include "i2clcd_private.h"
+#include "lcd.h"
+#include "lcd_private.h"
 
 using namespace upm;
 
diff --git a/src/lcd/i2clcd.h b/src/lcd/lcd.h
similarity index 100%
rename from src/lcd/i2clcd.h
rename to src/lcd/lcd.h
diff --git a/src/lcd/i2clcd_private.h b/src/lcd/lcd_private.h
similarity index 100%
rename from src/lcd/i2clcd_private.h
rename to src/lcd/lcd_private.h
diff --git a/src/lcd/lcm1602.h b/src/lcd/lcm1602.h
index 691ad6b7..2d474d84 100644
--- a/src/lcd/lcm1602.h
+++ b/src/lcd/lcm1602.h
@@ -28,7 +28,7 @@
 #pragma once
 
 #include <string>
-#include "i2clcd.h"
+#include "lcd.h"
 
 namespace upm
 {
diff --git a/src/lcd/pyupm_i2clcd.i b/src/lcd/pyupm_i2clcd.i
index 88d2f81b..9e19722f 100644
--- a/src/lcd/pyupm_i2clcd.i
+++ b/src/lcd/pyupm_i2clcd.i
@@ -12,9 +12,9 @@
 %feature("autodoc", "3");
 
 %include "ssd.h"
-%include "i2clcd.h"
+%include "lcd.h"
 %{
-    #include "i2clcd.h"
+    #include "lcd.h"
 %}
 
 %include "jhd1313m1.h"
diff --git a/src/lcd/ssd1308.h b/src/lcd/ssd1308.h
index b4514680..4f3ef071 100644
--- a/src/lcd/ssd1308.h
+++ b/src/lcd/ssd1308.h
@@ -25,7 +25,7 @@
 #pragma once
 
 #include <string>
-#include "i2clcd.h"
+#include "lcd.h"
 #include "ssd.h"
 
 namespace upm
diff --git a/src/lcd/ssd1327.h b/src/lcd/ssd1327.h
index 92924bcc..94fd00f5 100644
--- a/src/lcd/ssd1327.h
+++ b/src/lcd/ssd1327.h
@@ -25,7 +25,7 @@
 #pragma once
 
 #include <string>
-#include "i2clcd.h"
+#include "lcd.h"
 #include "ssd.h"
 
 namespace upm