diff --git a/meta-filesystems/files/static-passwd-meta-filesystems b/meta-filesystems/files/static-passwd
similarity index 100%
rename from meta-filesystems/files/static-passwd-meta-filesystems
rename to meta-filesystems/files/static-passwd
diff --git a/meta-gnome/files/static-passwd-meta-gnome b/meta-gnome/files/static-passwd
similarity index 100%
rename from meta-gnome/files/static-passwd-meta-gnome
rename to meta-gnome/files/static-passwd
diff --git a/meta-multimedia/files/static-group-meta-multimedia b/meta-multimedia/files/static-group
similarity index 100%
rename from meta-multimedia/files/static-group-meta-multimedia
rename to meta-multimedia/files/static-group
diff --git a/meta-multimedia/files/static-passwd-meta-multimedia b/meta-multimedia/files/static-passwd
similarity index 100%
rename from meta-multimedia/files/static-passwd-meta-multimedia
rename to meta-multimedia/files/static-passwd
diff --git a/meta-networking/files/static-group-meta-networking b/meta-networking/files/static-group
similarity index 100%
rename from meta-networking/files/static-group-meta-networking
rename to meta-networking/files/static-group
diff --git a/meta-networking/files/static-passwd-meta-networking b/meta-networking/files/static-passwd
similarity index 100%
rename from meta-networking/files/static-passwd-meta-networking
rename to meta-networking/files/static-passwd
diff --git a/meta-oe/files/static-group-meta-oe b/meta-oe/files/static-group
similarity index 100%
rename from meta-oe/files/static-group-meta-oe
rename to meta-oe/files/static-group
diff --git a/meta-oe/files/static-passwd-meta-oe b/meta-oe/files/static-passwd
similarity index 100%
rename from meta-oe/files/static-passwd-meta-oe
rename to meta-oe/files/static-passwd
diff --git a/meta-perl/files/static-group-meta-perl b/meta-perl/files/static-group
similarity index 100%
rename from meta-perl/files/static-group-meta-perl
rename to meta-perl/files/static-group
diff --git a/meta-perl/files/static-passwd-meta-perl b/meta-perl/files/static-passwd
similarity index 100%
rename from meta-perl/files/static-passwd-meta-perl
rename to meta-perl/files/static-passwd
diff --git a/meta-webserver/files/static-group-meta-webserver b/meta-webserver/files/static-group
similarity index 100%
rename from meta-webserver/files/static-group-meta-webserver
rename to meta-webserver/files/static-group
diff --git a/meta-webserver/files/static-passwd-meta-webserver b/meta-webserver/files/static-passwd
similarity index 100%
rename from meta-webserver/files/static-passwd-meta-webserver
rename to meta-webserver/files/static-passwd