diff --git a/classes/archive-configured-source.bbclass b/classes/sysmocom-archive-configured-source.bbclass
similarity index 96%
rename from classes/archive-configured-source.bbclass
rename to classes/sysmocom-archive-configured-source.bbclass
index 1a609b36db..11e9206e26 100644
--- a/classes/archive-configured-source.bbclass
+++ b/classes/sysmocom-archive-configured-source.bbclass
@@ -2,7 +2,7 @@
 # and creating diff file(get all environment variables and functions in building and mapping all content in 's' including patches to  xxx.diff.gz.
 # All archived packages will be deployed in ${DEPLOY_DIR}/sources
 
-inherit archiver
+inherit sysmocom-archiver
 
 # Get archiving package with configured sources including patches
 do_configure[postfuncs] += "do_archive_configured_sources "
diff --git a/classes/archive-original-source.bbclass b/classes/sysmocom-archive-original-source.bbclass
similarity index 96%
rename from classes/archive-original-source.bbclass
rename to classes/sysmocom-archive-original-source.bbclass
index b08553365c..3fc330d2cf 100644
--- a/classes/archive-original-source.bbclass
+++ b/classes/sysmocom-archive-original-source.bbclass
@@ -2,7 +2,7 @@
 # creating diff file(get all environment variables and functions in building and mapping all content in 's' including patches to  xxx.diff.gz.
 # All archived packages will be deployed in ${DEPLOY_DIR}/sources
 
-inherit archiver
+inherit sysmocom-archiver
 
 # Get original sources archiving package with patches
 do_unpack[postfuncs] += "do_archive_original_sources_patches "
diff --git a/classes/archive-patched-source.bbclass b/classes/sysmocom-archive-patched-source.bbclass
similarity index 96%
rename from classes/archive-patched-source.bbclass
rename to classes/sysmocom-archive-patched-source.bbclass
index a6d368f2ca..1119fc2f81 100644
--- a/classes/archive-patched-source.bbclass
+++ b/classes/sysmocom-archive-patched-source.bbclass
@@ -2,7 +2,7 @@
 # creating diff file(get all environment variables and functions in building and mapping all content in 's' including patches to  xxx.diff.gz.
 # All archived packages will be deployed in ${DEPLOY_DIR}/sources
 
-inherit archiver
+inherit sysmocom-archiver
 
 # Get archiving package with patched sources including patches
 do_patch[postfuncs] += "do_archive_patched_sources "
diff --git a/classes/archiver.bbclass b/classes/sysmocom-archiver.bbclass
similarity index 100%
rename from classes/archiver.bbclass
rename to classes/sysmocom-archiver.bbclass