diff --git a/src/Makefile b/src/Makefile
index db50ab1..59dfccc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,11 +3,11 @@ STATIC_LIB = libcorefw.a
 LIB_MAJOR = 0
 LIB_MINOR = 0
 
-SRCS = cfwarray.c	\
-       cfwclass.c	\
-       cfwobject.c	\
-       cfwrange.c	\
-       cfwstring.c
+SRCS = array.c	\
+       class.c	\
+       object.c	\
+       range.c	\
+       string.c
 
 INCLUDES = ${SRCS:.c=.h} \
 	   corefw.h
diff --git a/src/cfwarray.c b/src/array.c
similarity index 99%
rename from src/cfwarray.c
rename to src/array.c
index cd45b8f..d50d79a 100644
--- a/src/cfwarray.c
+++ b/src/array.c
@@ -27,8 +27,8 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#include "cfwobject.h"
-#include "cfwarray.h"
+#include "object.h"
+#include "array.h"
 
 struct CFWArray {
 	CFWObject obj;
diff --git a/src/cfwarray.h b/src/array.h
similarity index 98%
rename from src/cfwarray.h
rename to src/array.h
index 40f25ec..6a1c3e4 100644
--- a/src/cfwarray.h
+++ b/src/array.h
@@ -27,7 +27,7 @@
 #ifndef __CFWARRAY_H__
 #define __CFWARRAY_H__
 
-#include "cfwclass.h"
+#include "class.h"
 
 typedef struct CFWArray CFWArray;
 extern CFWClass *cfw_array;
diff --git a/src/cfwclass.c b/src/class.c
similarity index 98%
rename from src/cfwclass.c
rename to src/class.c
index af34bca..0f82214 100644
--- a/src/cfwclass.c
+++ b/src/class.c
@@ -24,7 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "cfwclass.h"
+#include "class.h"
 
 const char*
 cfw_class_name(CFWClass *cls)
diff --git a/src/cfwclass.h b/src/class.h
similarity index 100%
rename from src/cfwclass.h
rename to src/class.h
diff --git a/src/corefw.h b/src/corefw.h
index fdda80a..c7c0c60 100644
--- a/src/corefw.h
+++ b/src/corefw.h
@@ -1,9 +1,9 @@
 #ifndef __COREFW_H__
 #define __COREFW_H__
 
-#include "cfwclass.h"
-#include "cfwobject.h"
-#include "cfwstring.h"
-#include "cfwarray.h"
+#include "class.h"
+#include "object.h"
+#include "string.h"
+#include "array.h"
 
 #endif
diff --git a/src/cfwobject.c b/src/object.c
similarity index 99%
rename from src/cfwobject.c
rename to src/object.c
index 76e5486..251bc18 100644
--- a/src/cfwobject.c
+++ b/src/object.c
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include "cfwobject.h"
+#include "object.h"
 
 void*
 cfw_new(CFWClass *class, ...)
diff --git a/src/cfwobject.h b/src/object.h
similarity index 98%
rename from src/cfwobject.h
rename to src/object.h
index 1b8597a..d3bd6d7 100644
--- a/src/cfwobject.h
+++ b/src/object.h
@@ -27,7 +27,7 @@
 #ifndef __CFWOBJECT_H__
 #define __CFWOBJECT_H__
 
-#include "cfwclass.h"
+#include "class.h"
 
 typedef struct CFWObject {
 	CFWClass *cls;
diff --git a/src/cfwrange.c b/src/range.c
similarity index 98%
rename from src/cfwrange.c
rename to src/range.c
index d1fcd19..3e96e97 100644
--- a/src/cfwrange.c
+++ b/src/range.c
@@ -27,7 +27,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "cfwrange.h"
+#include "range.h"
 
 cfw_range_t cfw_range_all = { 0, SIZE_MAX };
 
diff --git a/src/cfwrange.h b/src/range.h
similarity index 100%
rename from src/cfwrange.h
rename to src/range.h
diff --git a/src/cfwstring.c b/src/string.c
similarity index 98%
rename from src/cfwstring.c
rename to src/string.c
index f0ce883..5683920 100644
--- a/src/cfwstring.c
+++ b/src/string.c
@@ -27,8 +27,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "cfwobject.h"
-#include "cfwstring.h"
+#include "object.h"
+#include "string.h"
 
 struct CFWString {
 	CFWObject obj;
diff --git a/src/cfwstring.h b/src/string.h
similarity index 98%
rename from src/cfwstring.h
rename to src/string.h
index 6572f28..9220614 100644
--- a/src/cfwstring.h
+++ b/src/string.h
@@ -27,7 +27,7 @@
 #ifndef __CFWSTRING_H__
 #define __CFWSTRING_H__
 
-#include "cfwclass.h"
+#include "class.h"
 
 typedef struct CFWString CFWString;
 extern CFWClass *cfw_string;