diff --git a/Content.Shared/Physics/CollisionGroup.cs b/Content.Shared/Physics/CollisionGroup.cs
index 2878302e9a..1f19184b50 100644
--- a/Content.Shared/Physics/CollisionGroup.cs
+++ b/Content.Shared/Physics/CollisionGroup.cs
@@ -59,9 +59,6 @@ public enum CollisionGroup
     TableMask = Impassable | MidImpassable,
     TableLayer = MidImpassable,
 
-    // Tables that SmallMobs can't go under
-    CounterLayer = MidImpassable | LowImpassable,
-
     // Tabletop machines, windoors, firelocks
     TabletopMachineMask = Impassable | HighImpassable,
     // Tabletop machines
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
index 3cbbccd3ca..27cb4d8b68 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
@@ -57,4 +57,4 @@
         mask:
         - TableMask
         layer:
-        - CounterLayer
+        - TableLayer
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
index edf653d066..fda2ac5e18 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -77,7 +77,7 @@
         mask:
         - TableMask
         layer:
-        - CounterLayer
+        - TableLayer
   - type: Damageable
     damageContainer: StructuralInorganic
     damageModifierSet: Wood
@@ -201,7 +201,7 @@
 
 - type: entity
   id: TableReinforced
-  parent: CounterBase
+  parent: TableBase
   name: reinforced table
   description: A square piece of metal standing on four metal legs. Extra robust.
   components:
@@ -471,7 +471,7 @@
 
 - type: entity
   id: TableBrass
-  parent: CounterBase
+  parent: TableBase
   name: brass table
   description: A shiny, corrosion resistant brass table. Steampunk!
   components:
@@ -615,7 +615,7 @@
 
 - type: entity
   id: TableStone
-  parent: CounterBase
+  parent: TableBase
   name: stone table
   description: Literally the sturdiest thing you have ever seen.
   components:
@@ -675,7 +675,7 @@
       collection: FootstepCarpet
 
 - type: entity
-  parent: CounterBase
+  parent: TableBase
   id: TableXeno
   name: xeno table
   description: I wouldn't put the silverware on it.
diff --git a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
index 1009374cd6..4867fc84d8 100644
--- a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
+++ b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
@@ -105,7 +105,7 @@
           mask:
             - TableMask
           layer:
-            - CounterLayer
+            - TableLayer
     - type: TimedDespawn
       lifetime: 180
     - type: PointLight
diff --git a/Resources/Prototypes/Entities/Structures/conveyor.yml b/Resources/Prototypes/Entities/Structures/conveyor.yml
index feec88eeaf..6722181b26 100644
--- a/Resources/Prototypes/Entities/Structures/conveyor.yml
+++ b/Resources/Prototypes/Entities/Structures/conveyor.yml
@@ -29,7 +29,10 @@
           - 0.50,0.50
           - -0.50,0.50
         layer:
-        - ConveyorMask
+        - Impassable
+        - MidImpassable
+        - LowImpassable
+        - DoorPassable
         hard: False
   - type: Conveyor
   - type: DeviceNetwork