diff --git a/includes/KIMAP/GetMetadataJob b/includes/KIMAP/GetMetaDataJob
similarity index 100%
rename from includes/KIMAP/GetMetadataJob
rename to includes/KIMAP/GetMetaDataJob
diff --git a/includes/KIMAP/MetadataJobBase b/includes/KIMAP/MetaDataJobBase
similarity index 100%
rename from includes/KIMAP/MetadataJobBase
rename to includes/KIMAP/MetaDataJobBase
diff --git a/includes/KIMAP/RFCCodecs b/includes/KIMAP/RFCCodecs
deleted file mode 100644
index 50169c4fc..000000000
--- a/includes/KIMAP/RFCCodecs
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../kimap/rfccodecs.h"
diff --git a/includes/KIMAP/SetMetadataJob b/includes/KIMAP/SetMetaDataJob
similarity index 100%
rename from includes/KIMAP/SetMetadataJob
rename to includes/KIMAP/SetMetaDataJob