diff --git a/.make/Makefile.common b/.make/common.mk
similarity index 100%
rename from .make/Makefile.common
rename to .make/common.mk
diff --git a/.make/Makefile.go b/.make/go.mk
similarity index 100%
rename from .make/Makefile.go
rename to .make/go.mk
diff --git a/Makefile b/Makefile
index c691fe9..ebda3c9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 # Common makefile commands & variables between projects
-include .make/Makefile.common
+include .make/common.mk
 
 # Common Golang makefile commands & variables between projects
-include .make/Makefile.go
+include .make/go.mk
 
 ## Not defined? Use default repo name which is the application
 ifeq ($(REPO_NAME),)