diff --git a/Makefile b/Makefile
index 407074b1..1b5afa97 100755
--- a/Makefile
+++ b/Makefile
@@ -149,17 +149,18 @@ help:
 
 -include internal/internal.mk
 
-include make/bootstrap.mk
-include make/clean.mk
+include make/buildsystem-bootstrap.mk
+include make/buildsystem-clean.mk
+include make/buildsystem-helpers.mk
+include make/buildsystem-prerequisites.mk
+include make/buildsystem-update.mk
 include make/crosstool.mk
-include make/helpers.mk
-include make/image-updates.mk
-include make/images.mk
+include make/flash-updates.mk
+include make/flash-images.mk
 include make/linux-kernel.mk
 include make/linux-drivers.mk
-include make/neutrino.mk
-include make/neutrino-plugins.mk
-include make/prerequisites.mk
+include make/target-neutrino.mk
+include make/target-neutrino-plugins.mk
 include make/target-blobs.mk
 include make/target-development.mk
 include make/target-ffmpeg$(if $(filter $(BOXTYPE),coolstream),-coolstream).mk
@@ -173,7 +174,6 @@ include make/target-scripts.mk
 include make/target-tools.mk
 include make/target-tools-unused.mk
 include make/host-tools.mk
-include make/update.mk
 
 include make/ni.mk
 
diff --git a/make/bootstrap.mk b/make/buildsystem-bootstrap.mk
similarity index 100%
rename from make/bootstrap.mk
rename to make/buildsystem-bootstrap.mk
diff --git a/make/clean.mk b/make/buildsystem-clean.mk
similarity index 100%
rename from make/clean.mk
rename to make/buildsystem-clean.mk
diff --git a/make/helpers.mk b/make/buildsystem-helpers.mk
similarity index 88%
rename from make/helpers.mk
rename to make/buildsystem-helpers.mk
index 93aa8211..8629a29f 100644
--- a/make/helpers.mk
+++ b/make/buildsystem-helpers.mk
@@ -216,6 +216,25 @@ patches-info:
 
 # -----------------------------------------------------------------------------
 
+# Create reversed changelog using git log --reverse.
+# Remove duplicated commits and re-reverse the changelog using awk.
+# This keeps the original commit and removes all picked duplicates.
+define make-changelog
+	git log --reverse --pretty=oneline --no-merges --abbrev-commit | \
+	awk '!seen[substr($$0,12)]++' | \
+	awk '{a[i++]=$$0} END {for (j=i-1; j>=0;) print a[j--]}'
+endef
+
+changelogs:
+	$(call make-changelog) > $(STAGING_DIR)/changelog-buildsystem
+	$(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); \
+		$(call make-changelog) > $(STAGING_DIR)/changelog-neutrino
+	$(CD) $(SOURCE_DIR)/$(NI-LIBSTB-HAL); \
+		$(call make-changelog) > $(STAGING_DIR)/changelog-libstb-hal
+
+# -----------------------------------------------------------------------------
+
 PHONY += archives-list
 PHONY += archives-info
 PHONY += patches-info
+PHONY += changelogs
diff --git a/make/prerequisites.mk b/make/buildsystem-prerequisites.mk
similarity index 100%
rename from make/prerequisites.mk
rename to make/buildsystem-prerequisites.mk
diff --git a/make/update.mk b/make/buildsystem-update.mk
similarity index 100%
rename from make/update.mk
rename to make/buildsystem-update.mk
diff --git a/make/images.mk b/make/flash-images.mk
similarity index 100%
rename from make/images.mk
rename to make/flash-images.mk
diff --git a/make/image-updates.mk b/make/flash-updates.mk
similarity index 100%
rename from make/image-updates.mk
rename to make/flash-updates.mk
diff --git a/make/ni.mk b/make/ni.mk
index 92e72d25..e91948f9 100644
--- a/make/ni.mk
+++ b/make/ni.mk
@@ -101,25 +101,6 @@ endif
 
 # -----------------------------------------------------------------------------
 
-# Create reversed changelog using git log --reverse.
-# Remove duplicated commits and re-reverse the changelog using awk.
-# This keeps the original commit and removes all picked duplicates.
-define make-changelog
-	git log --reverse --pretty=oneline --no-merges --abbrev-commit | \
-	awk '!seen[substr($$0,12)]++' | \
-	awk '{a[i++]=$$0} END {for (j=i-1; j>=0;) print a[j--]}'
-endef
-
-changelogs:
-	$(call make-changelog) > $(STAGING_DIR)/changelog-buildsystem
-	$(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); \
-		$(call make-changelog) > $(STAGING_DIR)/changelog-neutrino
-	$(CD) $(SOURCE_DIR)/$(NI-LIBSTB-HAL); \
-		$(call make-changelog) > $(STAGING_DIR)/changelog-libstb-hal
-
-# -----------------------------------------------------------------------------
-
 PHONY += images ni-images
 PHONY += personalized-image
 PHONY += image ni-image
-PHONY += changelogs
diff --git a/make/neutrino-plugins.mk b/make/target-neutrino-plugins.mk
similarity index 100%
rename from make/neutrino-plugins.mk
rename to make/target-neutrino-plugins.mk
diff --git a/make/neutrino.mk b/make/target-neutrino.mk
similarity index 100%
rename from make/neutrino.mk
rename to make/target-neutrino.mk