diff --git a/argument.C b/argument.cpp
similarity index 98%
rename from argument.C
rename to argument.cpp
index a7e0a94..a988ca5 100644
--- a/argument.C
+++ b/argument.cpp
@@ -2,7 +2,7 @@
 #include <iterator>
 #include <algorithm>
 #include <cassert>
-#include "argument.H"
+#include "argument.hpp"
 
 ArgumentParser::ArgumentParser(int argc, char** argv)
 {
diff --git a/argument.H b/argument.hpp
similarity index 100%
rename from argument.H
rename to argument.hpp
diff --git a/fru-area.H b/fru-area.hpp
similarity index 98%
rename from fru-area.H
rename to fru-area.hpp
index 82206bb..76a3509 100644
--- a/fru-area.H
+++ b/fru-area.hpp
@@ -8,7 +8,7 @@
 #include <vector>
 #include <memory>
 #include "frup.h"
-#include "writefrudata.H"
+#include "writefrudata.hpp"
 
 class ipmi_fru;
 typedef std::vector<std::unique_ptr<ipmi_fru>> fru_area_vec_t;
diff --git a/readeeprom.C b/readeeprom.cpp
similarity index 97%
rename from readeeprom.C
rename to readeeprom.cpp
index b78f35e..1b47cb8 100644
--- a/readeeprom.C
+++ b/readeeprom.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <memory>
-#include "argument.H"
-#include "writefrudata.H"
+#include "argument.hpp"
+#include "writefrudata.hpp"
 
 static void exit_with_error(const char* err, char** argv)
 {
diff --git a/strgfnhandler.C b/strgfnhandler.cpp
similarity index 98%
rename from strgfnhandler.C
rename to strgfnhandler.cpp
index eda4290..66eda15 100644
--- a/strgfnhandler.C
+++ b/strgfnhandler.cpp
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include "writefrudata.H"
+#include "writefrudata.hpp"
 
 void register_netfn_storage_write_fru() __attribute__((constructor));
 
diff --git a/writefrudata.C b/writefrudata.cpp
similarity index 99%
rename from writefrudata.C
rename to writefrudata.cpp
index 035a0c7..3619966 100644
--- a/writefrudata.C
+++ b/writefrudata.cpp
@@ -13,7 +13,7 @@
 #include <sstream>
 #include <mapper.h>
 #include "frup.h"
-#include "fru-area.H"
+#include "fru-area.hpp"
 
 // OpenBMC System Manager dbus framework
 const char  *sys_object_name   =  "/org/openbmc/managers/System";
diff --git a/writefrudata.H b/writefrudata.hpp
similarity index 100%
rename from writefrudata.H
rename to writefrudata.hpp