diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0adf917..8602c9f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,10 +8,10 @@ add_library(sirit
     operand.cpp
     operand.h
     literal.cpp
-    lnumber.cpp
-    lnumber.h
-    lstring.cpp
-    lstring.h
+    literal-number.cpp
+    literal-number.h
+    literal-string.cpp
+    literal-string.h
     common_types.h
     insts.h
     insts/type.cpp
diff --git a/src/literal-number.cpp b/src/literal-number.cpp
index e7f79f1..8c8a56a 100644
--- a/src/literal-number.cpp
+++ b/src/literal-number.cpp
@@ -4,7 +4,7 @@
  * Lesser General Public License version 2.1 or any later version.
  */
 
-#include "lnumber.h"
+#include "literal-number.h"
 #include <cassert>
 
 namespace Sirit {
diff --git a/src/literal-string.cpp b/src/literal-string.cpp
index d12a55f..65e376c 100644
--- a/src/literal-string.cpp
+++ b/src/literal-string.cpp
@@ -4,7 +4,7 @@
  * Lesser General Public License version 2.1 or any later version.
  */
 
-#include "lstring.h"
+#include "literal-string.h"
 
 namespace Sirit {
 
diff --git a/src/literal.cpp b/src/literal.cpp
index b1e29bc..ba8738a 100644
--- a/src/literal.cpp
+++ b/src/literal.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "common_types.h"
-#include "lnumber.h"
+#include "literal-number.h"
 #include "operand.h"
 #include "sirit/sirit.h"
 
diff --git a/src/op.cpp b/src/op.cpp
index 04f3d2e..c1d3e19 100644
--- a/src/op.cpp
+++ b/src/op.cpp
@@ -7,8 +7,8 @@
 #include <cassert>
 
 #include "common_types.h"
-#include "lnumber.h"
-#include "lstring.h"
+#include "literal-number.h"
+#include "literal-string.h"
 #include "op.h"
 #include "operand.h"
 
diff --git a/src/sirit.cpp b/src/sirit.cpp
index 7706e68..fee7325 100644
--- a/src/sirit.cpp
+++ b/src/sirit.cpp
@@ -63,8 +63,6 @@ std::vector<u8> Module::Assemble() const {
     return bytes;
 }
 
-void Module::Optimize(int level) {}
-
 void Module::AddCapability(spv::Capability capability) {
     capabilities.insert(capability);
 }