diff --git a/tests/test_rpc/test_rpc.py b/tests/test_rpc/test_rpc.py
index 0eeb5fc..dd062f5 100644
--- a/tests/test_rpc/test_rpc.py
+++ b/tests/test_rpc/test_rpc.py
@@ -44,8 +44,8 @@
 
 def build_source():
     return UUri(
-        authority=UAuthority(name="vcu.someVin.veh.ultifi.gm.com"),
-        entity=UEntity(name="petapp.ultifi.gm.com", version_major=1),
+        authority=UAuthority(name="vcu.someVin.veh.steven.gm.com"),
+        entity=UEntity(name="petapp.steven.gm.com", version_major=1),
         resource=UResourceBuilder.for_rpc_request(None),
     )
 
diff --git a/tests/test_transport/test_builder/test_uattributesbuilder.py b/tests/test_transport/test_builder/test_uattributesbuilder.py
index 026e98f..041029a 100644
--- a/tests/test_transport/test_builder/test_uattributesbuilder.py
+++ b/tests/test_transport/test_builder/test_uattributesbuilder.py
@@ -36,16 +36,16 @@
 
 def build_source():
     return UUri(
-        authority=UAuthority(name="vcu.someVin.veh.ultifi.gm.com"),
-        entity=UEntity(name="petapp.ultifi.gm.com", version_major=1),
+        authority=UAuthority(name="vcu.someVin.veh.steven.gm.com"),
+        entity=UEntity(name="petapp.steven.gm.com", version_major=1),
         resource=UResourceBuilder.for_rpc_request(None),
     )
 
 
 def build_sink():
     return UUri(
-        authority=UAuthority(name="vcu.someVin.veh.ultifi.gm.com"),
-        entity=UEntity(name="petapp.ultifi.gm.com", version_major=1),
+        authority=UAuthority(name="vcu.someVin.veh.steven.gm.com"),
+        entity=UEntity(name="petapp.steven.gm.com", version_major=1),
         resource=UResourceBuilder.for_rpc_response(),
     )
 
diff --git a/tests/test_transport/test_validate/test_uattributesvalidator.py b/tests/test_transport/test_validate/test_uattributesvalidator.py
index 76ac1d0..d18cc32 100644
--- a/tests/test_transport/test_validate/test_uattributesvalidator.py
+++ b/tests/test_transport/test_validate/test_uattributesvalidator.py
@@ -44,16 +44,16 @@
 
 def build_sink():
     return UUri(
-        authority=UAuthority(name="vcu.someVin.veh.ultifi.gm.com"),
-        entity=UEntity(name="petapp.ultifi.gm.com", version_major=1),
+        authority=UAuthority(name="vcu.someVin.veh.steven.gm.com"),
+        entity=UEntity(name="petapp.steven.gm.com", version_major=1),
         resource=UResourceBuilder.for_rpc_response(),
     )
 
 
 def build_source():
     return UUri(
-        authority=UAuthority(name="vcu.someVin.veh.ultifi.gm.com"),
-        entity=UEntity(name="petapp.ultifi.gm.com", version_major=1),
+        authority=UAuthority(name="vcu.someVin.veh.steven.gm.com"),
+        entity=UEntity(name="petapp.steven.gm.com", version_major=1),
         resource=UResourceBuilder.for_rpc_request(None),
     )
 
@@ -461,8 +461,8 @@ def test_validating_invalid_sink_attribute(self):
 
     def test_validating_valid_sink_attribute(self):
         uri = UUri(
-            authority=UAuthority(name="vcu.someVin.veh.ultifi.gm.com"),
-            entity=UEntity(name="petapp.ultifi.gm.com", version_major=1),
+            authority=UAuthority(name="vcu.someVin.veh.steven.gm.com"),
+            entity=UEntity(name="petapp.steven.gm.com", version_major=1),
             resource=UResourceBuilder.for_rpc_response(),
         )
         attributes = (
diff --git a/tests/test_uuid/test_factory/test_uuidutils.py b/tests/test_uuid/test_factory/test_uuidutils.py
index 1fe0ad4..f5b556a 100644
--- a/tests/test_uuid/test_factory/test_uuidutils.py
+++ b/tests/test_uuid/test_factory/test_uuidutils.py
@@ -43,8 +43,8 @@ def create_id():
 
 def build_source():
     return UUri(
-        authority=UAuthority(name="vcu.someVin.veh.ultifi.gm.com"),
-        entity=UEntity(name="petapp.ultifi.gm.com", version_major=1),
+        authority=UAuthority(name="vcu.someVin.veh.steven.gm.com"),
+        entity=UEntity(name="petapp.steven.gm.com", version_major=1),
         resource=UResource(name="door", instance="front_left", message="Door"),
     )