diff --git a/pype/plugins/maya/publish/extract_setdress.py b/pype/plugins/maya/publish/extract_assembly.py
similarity index 93%
rename from pype/plugins/maya/publish/extract_setdress.py
rename to pype/plugins/maya/publish/extract_assembly.py
index c4d613dc61..26b16a73c4 100644
--- a/pype/plugins/maya/publish/extract_setdress.py
+++ b/pype/plugins/maya/publish/extract_assembly.py
@@ -8,7 +8,7 @@ from pype.maya.lib import extract_alembic
 from maya import cmds
 
 
-class ExtractSetDress(pype.api.Extractor):
+class ExtractAssembly(pype.api.Extractor):
     """Produce an alembic of just point positions and normals.
 
     Positions and normals are preserved, but nothing more,
@@ -16,9 +16,9 @@ class ExtractSetDress(pype.api.Extractor):
 
     """
 
-    label = "Extract Set Dress"
+    label = "Extract Assembly"
     hosts = ["maya"]
-    families = ["setdress"]
+    families = ["assembly"]
 
     def process(self, instance):
 
diff --git a/pype/plugins/maya/publish/validate_setdress_namespaces.py b/pype/plugins/maya/publish/validate_assembly_namespaces.py
similarity index 87%
rename from pype/plugins/maya/publish/validate_setdress_namespaces.py
rename to pype/plugins/maya/publish/validate_assembly_namespaces.py
index 0d3b75ca37..f4519e9f4e 100644
--- a/pype/plugins/maya/publish/validate_setdress_namespaces.py
+++ b/pype/plugins/maya/publish/validate_assembly_namespaces.py
@@ -3,7 +3,7 @@ import pype.api
 import pype.maya.action
 
 
-class ValidateSetdressNamespaces(pyblish.api.InstancePlugin):
+class ValidateAssemblyNamespaces(pyblish.api.InstancePlugin):
     """Ensure namespaces are not nested
 
     In the outliner an item in a normal namespace looks as following:
@@ -15,9 +15,9 @@ class ValidateSetdressNamespaces(pyblish.api.InstancePlugin):
 
     """
 
-    label = "Validate Setdress Namespaces"
+    label = "Validate Assembly Namespaces"
     order = pyblish.api.ValidatorOrder
-    families = ["setdress"]
+    families = ["assembly"]
     actions = [pype.maya.action.SelectInvalidAction]
 
     def process(self, instance):
diff --git a/pype/plugins/maya/publish/validate_setdress_transforms.py b/pype/plugins/maya/publish/validate_assembly_transforms.py
similarity index 94%
rename from pype/plugins/maya/publish/validate_setdress_transforms.py
rename to pype/plugins/maya/publish/validate_assembly_transforms.py
index 918f4670be..9d46655cdc 100644
--- a/pype/plugins/maya/publish/validate_setdress_transforms.py
+++ b/pype/plugins/maya/publish/validate_assembly_transforms.py
@@ -6,7 +6,7 @@ from maya import cmds
 import pype.maya.action
 
 
-class ValidateSetDressModelTransforms(pyblish.api.InstancePlugin):
+class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin):
     """Verify only root nodes of the loaded asset have transformations.
 
     Note: This check is temporary and is subject to change.
@@ -26,8 +26,8 @@ class ValidateSetDressModelTransforms(pyblish.api.InstancePlugin):
     """
 
     order = pyblish.api.ValidatorOrder + 0.49
-    label = "Setdress Model Transforms"
-    families = ["setdress"]
+    label = "Assembly Model Transforms"
+    families = ["assembly"]
     actions = [pype.maya.action.SelectInvalidAction,
                pype.api.RepairAction]
 
@@ -38,7 +38,7 @@ class ValidateSetDressModelTransforms(pyblish.api.InstancePlugin):
     def process(self, instance):
         invalid = self.get_invalid(instance)
         if invalid:
-            raise RuntimeError("Found {} invalid transforms of setdress "
+            raise RuntimeError("Found {} invalid transforms of assembly "
                                "items".format(len(invalid)))
 
     @classmethod
diff --git a/pype/plugins/maya/publish/validate_node_ids.py b/pype/plugins/maya/publish/validate_node_ids.py
index c3b989f282..9102ef13ed 100644
--- a/pype/plugins/maya/publish/validate_node_ids.py
+++ b/pype/plugins/maya/publish/validate_node_ids.py
@@ -22,8 +22,8 @@ class ValidateNodeIDs(pyblish.api.InstancePlugin):
                 "rig",
                 "pointcache",
                 "animation",
-                "setdress",
-                "yetiRig"]
+                "yetiRig",
+                "assembly"]
 
     actions = [pype.maya.action.SelectInvalidAction,
                pype.maya.action.GenerateUUIDsOnInvalidAction]