diff --git a/common/Makefile.am b/common/Makefile.am
index 86d8fff..4fbbe1b 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -54,4 +54,4 @@ libcommon_la_SOURCES += \
 	hal_debug.cpp \
 	proc_tools.c \
 	pwrmngr.cpp \
-	version_hal.cpp
+	version.cpp
diff --git a/common/version_hal.cpp b/common/version.cpp
similarity index 98%
rename from common/version_hal.cpp
rename to common/version.cpp
index 822658a..330697e 100644
--- a/common/version_hal.cpp
+++ b/common/version.cpp
@@ -16,7 +16,7 @@
  */
 #include <libstb-hal-config.h>
 
-#include <version_hal.h>
+#include <version.h>
 
 
 void hal_get_lib_version(hal_libversion_t *ver)
diff --git a/include/version_hal.h b/include/version.h
similarity index 100%
rename from include/version_hal.h
rename to include/version.h