diff --git a/Makefile b/Makefile
index 447b129..8652658 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@
 $(WHITELIST_SRC) : generate_whitelist.sh $(WHITELIST_CONF)
 	./$^ > $@
 
-%.o: %.C
+%.o: %.cpp
 	$(CXX) -std=c++14 -fpic -c $< $(CXXFLAGS) $(INC_FLAG) $(IPMID_PATH) -o $@
 
 $(LIB_APP): $(LIB_APP_OBJ)
diff --git a/apphandler.C b/apphandler.cpp
similarity index 100%
rename from apphandler.C
rename to apphandler.cpp
diff --git a/chassishandler.C b/chassishandler.cpp
similarity index 100%
rename from chassishandler.C
rename to chassishandler.cpp
diff --git a/dcmihandler.C b/dcmihandler.cpp
similarity index 100%
rename from dcmihandler.C
rename to dcmihandler.cpp
diff --git a/globalhandler.C b/globalhandler.cpp
similarity index 100%
rename from globalhandler.C
rename to globalhandler.cpp
diff --git a/groupext.C b/groupext.cpp
similarity index 100%
rename from groupext.C
rename to groupext.cpp
diff --git a/ipmid.C b/ipmid.cpp
similarity index 100%
rename from ipmid.C
rename to ipmid.cpp
diff --git a/ipmisensor.C b/ipmisensor.cpp
similarity index 100%
rename from ipmisensor.C
rename to ipmisensor.cpp
diff --git a/sensorhandler.C b/sensorhandler.cpp
similarity index 100%
rename from sensorhandler.C
rename to sensorhandler.cpp
diff --git a/storageaddsel.C b/storageaddsel.cpp
similarity index 100%
rename from storageaddsel.C
rename to storageaddsel.cpp
diff --git a/storagehandler.C b/storagehandler.cpp
similarity index 100%
rename from storagehandler.C
rename to storagehandler.cpp
diff --git a/testaddsel.C b/testaddsel.cpp
similarity index 100%
rename from testaddsel.C
rename to testaddsel.cpp
diff --git a/testit.C b/testit.cpp
similarity index 100%
rename from testit.C
rename to testit.cpp
diff --git a/transporthandler.C b/transporthandler.cpp
similarity index 100%
rename from transporthandler.C
rename to transporthandler.cpp