diff --git a/rsd_lib/resources/v2_1/__init__.py b/rsd_lib/resources/v2_1/__init__.py
index bb4dc36..7fa5d9f 100644
--- a/rsd_lib/resources/v2_1/__init__.py
+++ b/rsd_lib/resources/v2_1/__init__.py
@@ -21,51 +21,52 @@ from rsd_lib.resources.v2_1.event_service import event_service
 from rsd_lib.resources.v2_1.fabric import fabric
 from rsd_lib.resources.v2_1.manager import manager
 from rsd_lib.resources.v2_1.node import node
-from rsd_lib.resources.v2_1.registries import registries
+from rsd_lib.resources.v2_1.registries import message_registry_file
 from rsd_lib.resources.v2_1.storage_service import storage_service
 from rsd_lib.resources.v2_1.system import system
 from rsd_lib.resources.v2_1.task import task_service
 
 
 class RSDLibV2_1(base.ResourceBase):
-    _systems_path = base.Field(['Systems', '@odata.id'], required=True)
+    _systems_path = base.Field(["Systems", "@odata.id"], required=True)
     """SystemCollection path"""
 
-    _nodes_path = base.Field(['Nodes', '@odata.id'], required=True)
+    _nodes_path = base.Field(["Nodes", "@odata.id"], required=True)
     """NodeCollection path"""
 
-    _chassis_path = base.Field(['Chassis', '@odata.id'])
+    _chassis_path = base.Field(["Chassis", "@odata.id"])
     """ChassisCollection path"""
 
-    _storage_service_path = base.Field(['Services', '@odata.id'])
+    _storage_service_path = base.Field(["Services", "@odata.id"])
     """StorageServiceCollection path"""
 
-    _fabrics_path = base.Field(['Fabrics', '@odata.id'])
+    _fabrics_path = base.Field(["Fabrics", "@odata.id"])
     """FabricCollection path"""
 
-    _managers_path = base.Field(['Managers', '@odata.id'])
+    _managers_path = base.Field(["Managers", "@odata.id"])
     """ManagerCollection path"""
 
-    _ethernet_switches_path = base.Field(['EthernetSwitches', '@odata.id'])
+    _ethernet_switches_path = base.Field(["EthernetSwitches", "@odata.id"])
     """EthernetSwitchCollecton path"""
 
-    _task_service_path = base.Field(['Tasks', '@odata.id'])
+    _task_service_path = base.Field(["Tasks", "@odata.id"])
     """Task Service path"""
 
-    _registries_path = base.Field(['Registries', '@odata.id'])
+    _registries_path = base.Field(["Registries", "@odata.id"])
     """RegistriesCollection path"""
 
-    _event_service_path = base.Field(['EventService', '@odata.id'])
+    _event_service_path = base.Field(["EventService", "@odata.id"])
     """Event Service path"""
 
-    _redfish_version = base.Field(['RedfishVersion'])
+    _redfish_version = base.Field(["RedfishVersion"])
     """Redfish version"""
 
-    _rsd_api_version = base.Field(['Oem', 'Intel_RackScale', 'ApiVersion'])
+    _rsd_api_version = base.Field(["Oem", "Intel_RackScale", "ApiVersion"])
     """RSD API version"""
 
-    def __init__(self, connector, identity="/redfish/v1/",
-                 redfish_version=None):
+    def __init__(
+        self, connector, identity="/redfish/v1/", redfish_version=None
+    ):
         """A class representing a ComposedNode
 
         :param connector: A Connector instance
@@ -82,8 +83,11 @@ class RSDLibV2_1(base.ResourceBase):
             not found
         :returns: a SystemCollection object
         """
-        return system.SystemCollection(self._conn, self._systems_path,
-                                       redfish_version=self.redfish_version)
+        return system.SystemCollection(
+            self._conn,
+            self._systems_path,
+            redfish_version=self.redfish_version,
+        )
 
     def get_system(self, identity):
         """Given the identity return a System object
@@ -91,8 +95,9 @@ class RSDLibV2_1(base.ResourceBase):
         :param identity: The identity of the System resource
         :returns: The System object
         """
-        return system.System(self._conn, identity,
-                             redfish_version=self.redfish_version)
+        return system.System(
+            self._conn, identity, redfish_version=self.redfish_version
+        )
 
     def get_node_collection(self):
         """Get the NodeCollection object
@@ -101,8 +106,9 @@ class RSDLibV2_1(base.ResourceBase):
             not found
         :returns: a NodeCollection object
         """
-        return node.NodeCollection(self._conn, self._nodes_path,
-                                   redfish_version=self.redfish_version)
+        return node.NodeCollection(
+            self._conn, self._nodes_path, redfish_version=self.redfish_version
+        )
 
     def get_node(self, identity):
         """Given the identity return a Node object
@@ -110,8 +116,9 @@ class RSDLibV2_1(base.ResourceBase):
         :param identity: The identity of the Node resource
         :returns: The Node object
         """
-        return node.Node(self._conn, identity,
-                         redfish_version=self.redfish_version)
+        return node.Node(
+            self._conn, identity, redfish_version=self.redfish_version
+        )
 
     def get_storage_service_collection(self):
         """Get the StorageServiceCollection object
@@ -121,8 +128,10 @@ class RSDLibV2_1(base.ResourceBase):
         :returns: a StorageServiceCollection object
         """
         return storage_service.StorageServiceCollection(
-            self._conn, self._storage_service_path,
-            redfish_version=self.redfish_version)
+            self._conn,
+            self._storage_service_path,
+            redfish_version=self.redfish_version,
+        )
 
     def get_storage_service(self, identity):
         """Given the identity return a StorageService object
@@ -131,8 +140,8 @@ class RSDLibV2_1(base.ResourceBase):
         :returns: The StorageService object
         """
         return storage_service.StorageService(
-            self._conn, identity,
-            redfish_version=self.redfish_version)
+            self._conn, identity, redfish_version=self.redfish_version
+        )
 
     def get_chassis_collection(self):
         """Get the ChassisCollection object
@@ -141,9 +150,11 @@ class RSDLibV2_1(base.ResourceBase):
             not found
         :returns: a ChassisCollection object
         """
-        return chassis.ChassisCollection(self._conn,
-                                         self._chassis_path,
-                                         redfish_version=self.redfish_version)
+        return chassis.ChassisCollection(
+            self._conn,
+            self._chassis_path,
+            redfish_version=self.redfish_version,
+        )
 
     def get_chassis(self, identity):
         """Given the identity return a Chassis object
@@ -151,9 +162,9 @@ class RSDLibV2_1(base.ResourceBase):
         :param identity: The identity of the Chassis resource
         :returns: The Chassis object
         """
-        return chassis.Chassis(self._conn,
-                               identity,
-                               redfish_version=self.redfish_version)
+        return chassis.Chassis(
+            self._conn, identity, redfish_version=self.redfish_version
+        )
 
     def get_fabric_collection(self):
         """Get the FabricCollection object
@@ -162,9 +173,11 @@ class RSDLibV2_1(base.ResourceBase):
             not found
         :returns: a FabricCollection object
         """
-        return fabric.FabricCollection(self._conn,
-                                       self._fabrics_path,
-                                       redfish_version=self.redfish_version)
+        return fabric.FabricCollection(
+            self._conn,
+            self._fabrics_path,
+            redfish_version=self.redfish_version,
+        )
 
     def get_fabric(self, identity):
         """Given the identity return a Fabric object
@@ -172,9 +185,9 @@ class RSDLibV2_1(base.ResourceBase):
         :param identity: The identity of the Fabric resource
         :returns: The Fabric object
         """
-        return fabric.Fabric(self._conn,
-                             identity,
-                             redfish_version=self.redfish_version)
+        return fabric.Fabric(
+            self._conn, identity, redfish_version=self.redfish_version
+        )
 
     def get_manager_collection(self):
         """Get the ManagerCollection object
@@ -183,9 +196,11 @@ class RSDLibV2_1(base.ResourceBase):
             not found
         :returns: a ManagerCollection object
         """
-        return manager.ManagerCollection(self._conn,
-                                         self._managers_path,
-                                         redfish_version=self.redfish_version)
+        return manager.ManagerCollection(
+            self._conn,
+            self._managers_path,
+            redfish_version=self.redfish_version,
+        )
 
     def get_manager(self, identity):
         """Given the identity return a Manager object
@@ -193,9 +208,9 @@ class RSDLibV2_1(base.ResourceBase):
         :param identity: The identity of the Manager resource
         :returns: The Manager object
         """
-        return manager.Manager(self._conn,
-                               identity,
-                               redfish_version=self.redfish_version)
+        return manager.Manager(
+            self._conn, identity, redfish_version=self.redfish_version
+        )
 
     def get_ethernet_switch_collection(self):
         """Get the EthernetSwitchCollection object
@@ -207,7 +222,7 @@ class RSDLibV2_1(base.ResourceBase):
         return ethernet_switch.EthernetSwitchCollection(
             self._conn,
             self._ethernet_switches_path,
-            redfish_version=self.redfish_version
+            redfish_version=self.redfish_version,
         )
 
     def get_ethernet_switch(self, identity):
@@ -217,18 +232,19 @@ class RSDLibV2_1(base.ResourceBase):
         :returns: The EthernetSwitch object
         """
         return ethernet_switch.EthernetSwitch(
-            self._conn,
-            identity,
-            redfish_version=self.redfish_version)
+            self._conn, identity, redfish_version=self.redfish_version
+        )
 
     def get_task_service(self):
         """Get the TaskService object
 
         :returns: The TaskService object
         """
-        return task_service.TaskService(self._conn,
-                                        self._task_service_path,
-                                        redfish_version=self.redfish_version)
+        return task_service.TaskService(
+            self._conn,
+            self._task_service_path,
+            redfish_version=self.redfish_version,
+        )
 
     def get_registries_collection(self):
         """Get the RegistriesCollection object
@@ -237,10 +253,10 @@ class RSDLibV2_1(base.ResourceBase):
             not found
         :returns: a RegistriesCollection object
         """
-        return registries.RegistriesCollection(
+        return message_registry_file.MessageRegistryFileCollection(
             self._conn,
             self._registries_path,
-            redfish_version=self.redfish_version
+            redfish_version=self.redfish_version,
         )
 
     def get_registries(self, identity):
@@ -249,16 +265,17 @@ class RSDLibV2_1(base.ResourceBase):
         :param identity: The identity of the registries resource
         :returns: The Registries object
         """
-        return registries.Registries(
-            self._conn,
-            identity,
-            redfish_version=self.redfish_version)
+        return message_registry_file.MessageRegistryFile(
+            self._conn, identity, redfish_version=self.redfish_version
+        )
 
     def get_event_service(self):
         """Return a EventService object
 
         :returns: The EventService object
         """
-        return event_service.EventService(self._conn,
-                                          self._event_service_path,
-                                          redfish_version=self.redfish_version)
+        return event_service.EventService(
+            self._conn,
+            self._event_service_path,
+            redfish_version=self.redfish_version,
+        )
diff --git a/rsd_lib/resources/v2_1/registries/message_registry_file.py b/rsd_lib/resources/v2_1/registries/message_registry_file.py
new file mode 100644
index 0000000..dee7d52
--- /dev/null
+++ b/rsd_lib/resources/v2_1/registries/message_registry_file.py
@@ -0,0 +1,64 @@
+# Copyright 2019 Intel, Inc.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from sushy.resources import base
+
+from rsd_lib import base as rsd_lib_base
+
+
+class LocationCollectionField(base.ListField):
+
+    language = base.Field("Language")
+    """The language code for the file the schema is in."""
+
+    uri = base.Field("Uri")
+    """Link to locally available URI for schema."""
+
+    archive_uri = base.Field("ArchiveUri")
+    """If the schema is hosted on the service in an archive file, this is the
+       link to the archive file.
+    """
+
+    publication_uri = base.Field("PublicationUri")
+    """Link to publicly available (canonical) URI for schema."""
+
+    archive_file = base.Field("ArchiveFile")
+    """If the schema is hosted on the service in an archive file, this is the
+       name of the file within the archive.
+    """
+
+
+class MessageRegistryFile(rsd_lib_base.ResourceBase):
+    """MessageRegistryFile resource class
+
+       This is the schema definition for the Schema File locator resource.
+    """
+
+    languages = base.Field("Languages")
+    """Language codes for the schemas available."""
+
+    registry = base.Field("Registry")
+    """The Registry Name, Major and Minor version used in MessageID
+       construction.
+    """
+
+    location = LocationCollectionField("Location")
+    """Location information for this schema file."""
+
+
+class MessageRegistryFileCollection(rsd_lib_base.ResourceCollectionBase):
+    @property
+    def _resource_type(self):
+        return MessageRegistryFile
diff --git a/rsd_lib/resources/v2_1/registries/registries.py b/rsd_lib/resources/v2_1/registries/registries.py
deleted file mode 100644
index 02f9824..0000000
--- a/rsd_lib/resources/v2_1/registries/registries.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2019 Intel, Inc.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from sushy.resources import base
-
-
-class LocationField(base.ListField):
-    language = base.Field("Language")
-    """The location language"""
-
-    publication_uri = base.Field("PublicationUri")
-    """The location publication uri"""
-
-
-class Registries(base.ResourceBase):
-    identity = base.Field("Id")
-    """The registries identity"""
-
-    name = base.Field("Name")
-    """The registries name"""
-
-    description = base.Field("Description")
-    """The registries description"""
-
-    languages = base.Field("Languages")
-    """The registries languages"""
-
-    registry = base.Field("Registry")
-    """The registry"""
-
-    location = LocationField("Location")
-    """The registries location"""
-
-    oem = base.Field("Oem")
-    """The registries oem"""
-
-    def __init__(self, connector, identity, redfish_version=None):
-        """A class representing a Registries
-
-        :param connector: A Connector instance
-        :param identity: The identity of the registries resource
-        :param redfish_version: The version of RedFish. Used to construct
-            the object according to schema of the given version.
-        """
-        super(Registries, self).__init__(connector, identity, redfish_version)
-
-
-class RegistriesCollection(base.ResourceCollectionBase):
-    @property
-    def _resource_type(self):
-        return Registries
-
-    def __init__(self, connector, path, redfish_version=None):
-        """A class representing a RegistriesCollection
-
-        :param connector: A Connector instance
-        :param path: The canonical path to the registries collection
-            resource
-        :param redfish_version: The version of RedFish. Used to construct
-            the object according to schema of the given version.
-        """
-        super(RegistriesCollection, self).__init__(connector, path,
-                                                   redfish_version)
diff --git a/rsd_lib/tests/unit/resources/v2_1/registries/test_registries.py b/rsd_lib/tests/unit/resources/v2_1/registries/test_registries.py
index a969be0..f044739 100644
--- a/rsd_lib/tests/unit/resources/v2_1/registries/test_registries.py
+++ b/rsd_lib/tests/unit/resources/v2_1/registries/test_registries.py
@@ -17,71 +17,82 @@ import json
 import mock
 import testtools
 
-from rsd_lib.resources.v2_1.registries import registries
+from rsd_lib.resources.v2_1.registries import message_registry_file
 
 
 class RegistriesTestCase(testtools.TestCase):
-
     def setUp(self):
         super(RegistriesTestCase, self).setUp()
         self.conn = mock.Mock()
-        with open('rsd_lib/tests/unit/json_samples/v2_1/registries.json',
-                  'r') as f:
+        with open(
+            "rsd_lib/tests/unit/json_samples/v2_1/registries.json", "r"
+        ) as f:
             self.conn.get.return_value.json.return_value = json.loads(f.read())
 
-        self.registries_inst = registries.Registries(
-            self.conn, '/redfish/v1/Registries/Base',
-            redfish_version='1.0.2')
+        self.registries_inst = message_registry_file.MessageRegistryFile(
+            self.conn, "/redfish/v1/Registries/Base", redfish_version="1.0.2"
+        )
 
     def test__parse_attributes(self):
         self.registries_inst._parse_attributes()
         self.assertEqual("Base", self.registries_inst.identity)
-        self.assertEqual("Base Message Registry File",
-                         self.registries_inst.name)
-        self.assertEqual("Base Message Registry File locations",
-                         self.registries_inst.description)
-        self.assertEqual(['en'], self.registries_inst.languages)
+        self.assertEqual(
+            "Base Message Registry File", self.registries_inst.name
+        )
+        self.assertEqual(
+            "Base Message Registry File locations",
+            self.registries_inst.description,
+        )
+        self.assertEqual(["en"], self.registries_inst.languages)
         self.assertEqual("Base.1.0", self.registries_inst.registry)
         self.assertEqual("en", self.registries_inst.location[0].language)
         self.assertEqual(
             "https://www.dmtf.org/sites/default/files/standards"
             "/documents/DSP8011_1.0.0a.json",
-            self.registries_inst.location[0].publication_uri)
-        self.assertEqual({}, self.registries_inst.oem)
+            self.registries_inst.location[0].publication_uri,
+        )
 
 
 class RegistriesCollectionTestCase(testtools.TestCase):
-
     def setUp(self):
         super(RegistriesCollectionTestCase, self).setUp()
         self.conn = mock.Mock()
 
-        with open('rsd_lib/tests/unit/json_samples/v2_1/'
-                  'registries_collection.json', 'r') as f:
+        with open(
+            "rsd_lib/tests/unit/json_samples/v2_1/"
+            "registries_collection.json",
+            "r",
+        ) as f:
             self.conn.get.return_value.json.return_value = json.loads(f.read())
 
-        self.registries_col = registries.RegistriesCollection(
-            self.conn,
-            '/redfish/v1/Registries',
-            redfish_version='1.0.2')
+        self.registries_col = message_registry_file.\
+            MessageRegistryFileCollection(
+                self.conn, "/redfish/v1/Registries", redfish_version="1.0.2"
+            )
 
     def test_parse_attributes(self):
         self.registries_col._parse_attributes()
         self.assertEqual("Registry File Collection", self.registries_col.name)
-        self.assertEqual(('/redfish/v1/Registries/Base',),
-                         self.registries_col.members_identities)
+        self.assertEqual(
+            ("/redfish/v1/Registries/Base",),
+            self.registries_col.members_identities,
+        )
 
-    @mock.patch.object(registries, 'Registries', autospec=True)
+    @mock.patch.object(
+        message_registry_file, "MessageRegistryFile", autospec=True
+    )
     def test_get_member(self, mock_registries):
-        self.registries_col.get_member('/redfish/v1/Registries/Base')
+        self.registries_col.get_member("/redfish/v1/Registries/Base")
 
         mock_registries.assert_called_once_with(
             self.registries_col._conn,
-            '/redfish/v1/Registries/Base',
-            redfish_version=self.registries_col.redfish_version
+            "/redfish/v1/Registries/Base",
+            redfish_version=self.registries_col.redfish_version,
         )
 
-    @mock.patch.object(registries, 'Registries', autospec=True)
+    @mock.patch.object(
+        message_registry_file, "MessageRegistryFile", autospec=True
+    )
     def test_get_members(self, mock_registries):
         members = self.registries_col.get_members()
         self.assertEqual(mock_registries.call_count, 1)
diff --git a/rsd_lib/tests/unit/resources/v2_1/test_rsdlib_v2_1.py b/rsd_lib/tests/unit/resources/v2_1/test_rsdlib_v2_1.py
index eb55c25..475d8ec 100644
--- a/rsd_lib/tests/unit/resources/v2_1/test_rsdlib_v2_1.py
+++ b/rsd_lib/tests/unit/resources/v2_1/test_rsdlib_v2_1.py
@@ -24,18 +24,17 @@ from rsd_lib.resources.v2_1.event_service import event_service
 from rsd_lib.resources.v2_1.fabric import fabric
 from rsd_lib.resources.v2_1.manager import manager
 from rsd_lib.resources.v2_1.node import node
-from rsd_lib.resources.v2_1.registries import registries
+from rsd_lib.resources.v2_1.registries import message_registry_file
 from rsd_lib.resources.v2_1.storage_service import storage_service
 from rsd_lib.resources.v2_1.system import system
 from rsd_lib.resources.v2_1.task import task_service
 
 
 class RSDLibV2_1TestCase(testtools.TestCase):
-
     def setUp(self):
         super(RSDLibV2_1TestCase, self).setUp()
         self.conn = mock.Mock()
-        with open('rsd_lib/tests/unit/json_samples/v2_1/root.json', 'r') as f:
+        with open("rsd_lib/tests/unit/json_samples/v2_1/root.json", "r") as f:
             self.conn.get.return_value.json.return_value = json.loads(f.read())
         self.rsd = v2_1.RSDLibV2_1(self.conn)
 
@@ -46,150 +45,192 @@ class RSDLibV2_1TestCase(testtools.TestCase):
         self.assertEqual("/redfish/v1/Systems", self.rsd._systems_path)
         self.assertEqual("/redfish/v1/Nodes", self.rsd._nodes_path)
         self.assertEqual("/redfish/v1/Chassis", self.rsd._chassis_path)
-        self.assertEqual("/redfish/v1/Services",
-                         self.rsd._storage_service_path)
+        self.assertEqual(
+            "/redfish/v1/Services", self.rsd._storage_service_path
+        )
         self.assertEqual("/redfish/v1/Fabrics", self.rsd._fabrics_path)
         self.assertEqual("/redfish/v1/Managers", self.rsd._managers_path)
-        self.assertEqual("/redfish/v1/EthernetSwitches",
-                         self.rsd._ethernet_switches_path)
-        self.assertEqual("/redfish/v1/TaskService",
-                         self.rsd._task_service_path)
-        self.assertEqual("/redfish/v1/Registries",
-                         self.rsd._registries_path)
-        self.assertEqual("/redfish/v1/EventService",
-                         self.rsd._event_service_path)
+        self.assertEqual(
+            "/redfish/v1/EthernetSwitches", self.rsd._ethernet_switches_path
+        )
+        self.assertEqual(
+            "/redfish/v1/TaskService", self.rsd._task_service_path
+        )
+        self.assertEqual("/redfish/v1/Registries", self.rsd._registries_path)
+        self.assertEqual(
+            "/redfish/v1/EventService", self.rsd._event_service_path
+        )
 
-    @mock.patch.object(system, 'SystemCollection', autospec=True)
+    @mock.patch.object(system, "SystemCollection", autospec=True)
     def test_get_system_collection(self, mock_system_collection):
         self.rsd.get_system_collection()
         mock_system_collection.assert_called_once_with(
-            self.rsd._conn, '/redfish/v1/Systems',
-            redfish_version=self.rsd.redfish_version)
+            self.rsd._conn,
+            "/redfish/v1/Systems",
+            redfish_version=self.rsd.redfish_version,
+        )
 
-    @mock.patch.object(system, 'System', autospec=True)
+    @mock.patch.object(system, "System", autospec=True)
     def test_get_system(self, mock_system):
-        self.rsd.get_system('fake-system-id')
+        self.rsd.get_system("fake-system-id")
         mock_system.assert_called_once_with(
-            self.rsd._conn, 'fake-system-id',
-            redfish_version=self.rsd.redfish_version)
+            self.rsd._conn,
+            "fake-system-id",
+            redfish_version=self.rsd.redfish_version,
+        )
 
-    @mock.patch.object(node, 'NodeCollection', autospec=True)
+    @mock.patch.object(node, "NodeCollection", autospec=True)
     def test_get_node_collection(self, mock_node_collection):
         self.rsd.get_node_collection()
         mock_node_collection.assert_called_once_with(
-            self.rsd._conn, '/redfish/v1/Nodes',
-            redfish_version=self.rsd.redfish_version)
+            self.rsd._conn,
+            "/redfish/v1/Nodes",
+            redfish_version=self.rsd.redfish_version,
+        )
 
-    @mock.patch.object(node, 'Node', autospec=True)
+    @mock.patch.object(node, "Node", autospec=True)
     def test_get_node(self, mock_node):
-        self.rsd.get_node('fake-node-id')
+        self.rsd.get_node("fake-node-id")
         mock_node.assert_called_once_with(
-            self.rsd._conn, 'fake-node-id',
-            redfish_version=self.rsd.redfish_version)
+            self.rsd._conn,
+            "fake-node-id",
+            redfish_version=self.rsd.redfish_version,
+        )
 
-    @mock.patch.object(fabric, 'FabricCollection', autospec=True)
+    @mock.patch.object(fabric, "FabricCollection", autospec=True)
     def test_get_fabric_collection(self, mock_fabric_collection):
         self.rsd.get_fabric_collection()
         mock_fabric_collection.assert_called_once_with(
-            self.rsd._conn, '/redfish/v1/Fabrics',
-            redfish_version=self.rsd.redfish_version)
+            self.rsd._conn,
+            "/redfish/v1/Fabrics",
+            redfish_version=self.rsd.redfish_version,
+        )
 
-    @mock.patch.object(fabric, 'Fabric', autospec=True)
+    @mock.patch.object(fabric, "Fabric", autospec=True)
     def test_get_fabric(self, mock_fabric):
-        self.rsd.get_fabric('fake-fabric-id')
+        self.rsd.get_fabric("fake-fabric-id")
         mock_fabric.assert_called_once_with(
-            self.rsd._conn, 'fake-fabric-id',
-            redfish_version=self.rsd.redfish_version)
+            self.rsd._conn,
+            "fake-fabric-id",
+            redfish_version=self.rsd.redfish_version,
+        )
 
-    @mock.patch.object(chassis, 'ChassisCollection', autospec=True)
+    @mock.patch.object(chassis, "ChassisCollection", autospec=True)
     def test_get_chassis_collection(self, mock_chassis_collection):
         self.rsd.get_chassis_collection()
         mock_chassis_collection.assert_called_once_with(
-            self.rsd._conn, '/redfish/v1/Chassis',
-            redfish_version=self.rsd.redfish_version)
+            self.rsd._conn,
+            "/redfish/v1/Chassis",
+            redfish_version=self.rsd.redfish_version,
+        )
 
-    @mock.patch.object(chassis, 'Chassis', autospec=True)
+    @mock.patch.object(chassis, "Chassis", autospec=True)
     def test_get_chassis(self, mock_chassis):
-        self.rsd.get_chassis('fake-chassis-id')
+        self.rsd.get_chassis("fake-chassis-id")
         mock_chassis.assert_called_once_with(
-            self.rsd._conn, 'fake-chassis-id',
-            redfish_version=self.rsd.redfish_version)
+            self.rsd._conn,
+            "fake-chassis-id",
+            redfish_version=self.rsd.redfish_version,
+        )
 
-    @mock.patch.object(storage_service, 'StorageServiceCollection',
-                       autospec=True)
-    def test_get_storage_service_collection(self,
-                                            mock_storage_service_collection):
+    @mock.patch.object(
+        storage_service, "StorageServiceCollection", autospec=True
+    )
+    def test_get_storage_service_collection(
+        self, mock_storage_service_collection
+    ):
         self.rsd.get_storage_service_collection()
         mock_storage_service_collection.assert_called_once_with(
-            self.rsd._conn, '/redfish/v1/Services',
-            redfish_version=self.rsd.redfish_version)
+            self.rsd._conn,
+            "/redfish/v1/Services",
+            redfish_version=self.rsd.redfish_version,
+        )
 
-    @mock.patch.object(storage_service, 'StorageService', autospec=True)
+    @mock.patch.object(storage_service, "StorageService", autospec=True)
     def test_get_storage_service(self, mock_storage_service):
-        self.rsd.get_storage_service('fake-storage-service-id')
+        self.rsd.get_storage_service("fake-storage-service-id")
         mock_storage_service.assert_called_once_with(
-            self.rsd._conn, 'fake-storage-service-id',
-            redfish_version=self.rsd.redfish_version)
+            self.rsd._conn,
+            "fake-storage-service-id",
+            redfish_version=self.rsd.redfish_version,
+        )
 
-    @mock.patch.object(manager, 'ManagerCollection', autospec=True)
-    def test_get_manager_collection(self,
-                                    mock_manager_collection):
+    @mock.patch.object(manager, "ManagerCollection", autospec=True)
+    def test_get_manager_collection(self, mock_manager_collection):
         self.rsd.get_manager_collection()
         mock_manager_collection.assert_called_once_with(
-            self.rsd._conn, '/redfish/v1/Managers',
-            redfish_version=self.rsd.redfish_version)
-
-    @mock.patch.object(manager, 'Manager', autospec=True)
-    def test_get_manager(self, mock_manager_service):
-        self.rsd.get_manager('fake-manager-id')
-        mock_manager_service.assert_called_once_with(
-            self.rsd._conn, 'fake-manager-id',
-            redfish_version=self.rsd.redfish_version
+            self.rsd._conn,
+            "/redfish/v1/Managers",
+            redfish_version=self.rsd.redfish_version,
         )
 
-    @mock.patch.object(ethernet_switch,
-                       'EthernetSwitchCollection',
-                       autospec=True)
-    def test_get_ethernet_switch_collection(self,
-                                            mock_ethernet_switch_collection):
+    @mock.patch.object(manager, "Manager", autospec=True)
+    def test_get_manager(self, mock_manager_service):
+        self.rsd.get_manager("fake-manager-id")
+        mock_manager_service.assert_called_once_with(
+            self.rsd._conn,
+            "fake-manager-id",
+            redfish_version=self.rsd.redfish_version,
+        )
+
+    @mock.patch.object(
+        ethernet_switch, "EthernetSwitchCollection", autospec=True
+    )
+    def test_get_ethernet_switch_collection(
+        self, mock_ethernet_switch_collection
+    ):
         self.rsd.get_ethernet_switch_collection()
         mock_ethernet_switch_collection.assert_called_once_with(
-            self.rsd._conn, '/redfish/v1/EthernetSwitches',
-            redfish_version=self.rsd.redfish_version)
-
-    @mock.patch.object(ethernet_switch, 'EthernetSwitch', autospec=True)
-    def test_get_ethernet_switch(self, mock_ethernet_switch_service):
-        self.rsd.get_ethernet_switch('fake-ethernet-switch-id')
-        mock_ethernet_switch_service.assert_called_once_with(
-            self.rsd._conn, 'fake-ethernet-switch-id',
-            redfish_version=self.rsd.redfish_version
+            self.rsd._conn,
+            "/redfish/v1/EthernetSwitches",
+            redfish_version=self.rsd.redfish_version,
         )
 
-    @mock.patch.object(task_service, 'TaskService', autospec=True)
+    @mock.patch.object(ethernet_switch, "EthernetSwitch", autospec=True)
+    def test_get_ethernet_switch(self, mock_ethernet_switch_service):
+        self.rsd.get_ethernet_switch("fake-ethernet-switch-id")
+        mock_ethernet_switch_service.assert_called_once_with(
+            self.rsd._conn,
+            "fake-ethernet-switch-id",
+            redfish_version=self.rsd.redfish_version,
+        )
+
+    @mock.patch.object(task_service, "TaskService", autospec=True)
     def test_get_task_service(self, mock_task_service):
         self.rsd.get_task_service()
         mock_task_service.assert_called_once_with(
-            self.rsd._conn, '/redfish/v1/TaskService',
-            redfish_version=self.rsd.redfish_version)
+            self.rsd._conn,
+            "/redfish/v1/TaskService",
+            redfish_version=self.rsd.redfish_version,
+        )
 
-    @mock.patch.object(registries, 'RegistriesCollection', autospec=True)
+    @mock.patch.object(
+        message_registry_file, "MessageRegistryFileCollection", autospec=True
+    )
     def test_get_registries_collection(self, mock_registries_collection):
         self.rsd.get_registries_collection()
         mock_registries_collection.assert_called_once_with(
-            self.rsd._conn, '/redfish/v1/Registries',
-            redfish_version=self.rsd.redfish_version)
-
-    @mock.patch.object(registries, 'Registries', autospec=True)
-    def test_get_registries(self, mock_registries_service):
-        self.rsd.get_registries('fake-registries-id')
-        mock_registries_service.assert_called_once_with(
-            self.rsd._conn, 'fake-registries-id',
-            redfish_version=self.rsd.redfish_version
+            self.rsd._conn,
+            "/redfish/v1/Registries",
+            redfish_version=self.rsd.redfish_version,
         )
 
-    @mock.patch.object(event_service, 'EventService', autospec=True)
+    @mock.patch.object(
+        message_registry_file, "MessageRegistryFile", autospec=True
+    )
+    def test_get_registries(self, mock_registries_service):
+        self.rsd.get_registries("fake-registries-id")
+        mock_registries_service.assert_called_once_with(
+            self.rsd._conn,
+            "fake-registries-id",
+            redfish_version=self.rsd.redfish_version,
+        )
+
+    @mock.patch.object(event_service, "EventService", autospec=True)
     def test_get_event_service(self, mock_event_service):
         self.rsd.get_event_service()
         mock_event_service.assert_called_once_with(
-            self.rsd._conn, '/redfish/v1/EventService',
-            redfish_version=self.rsd.redfish_version)
+            self.rsd._conn,
+            "/redfish/v1/EventService",
+            redfish_version=self.rsd.redfish_version,
+        )
diff --git a/rsd_lib/tests/unit/resources/v2_2/test_rsdlib_v2_2.py b/rsd_lib/tests/unit/resources/v2_2/test_rsdlib_v2_2.py
index eba3ccd..e2fa5b5 100644
--- a/rsd_lib/tests/unit/resources/v2_2/test_rsdlib_v2_2.py
+++ b/rsd_lib/tests/unit/resources/v2_2/test_rsdlib_v2_2.py
@@ -22,7 +22,8 @@ from rsd_lib.resources.v2_1.event_service import event_service \
     as v2_1_event_service
 from rsd_lib.resources.v2_1.fabric import fabric as v2_1_fabric
 from rsd_lib.resources.v2_1.node import node as v2_1_node
-from rsd_lib.resources.v2_1.registries import registries as v2_1_registries
+from rsd_lib.resources.v2_1.registries import message_registry_file \
+    as v2_1_registries
 from rsd_lib.resources.v2_1.storage_service import storage_service \
     as v2_1_storage_service
 from rsd_lib.resources.v2_1.task import task_service as v2_1_task_service
@@ -190,14 +191,15 @@ class RSDLibV2_2TestCase(testtools.TestCase):
             self.rsd._conn, '/redfish/v1/TaskService',
             redfish_version=self.rsd.redfish_version)
 
-    @mock.patch.object(v2_1_registries, 'RegistriesCollection', autospec=True)
+    @mock.patch.object(
+        v2_1_registries, 'MessageRegistryFileCollection', autospec=True)
     def test_get_registries_collection(self, mock_registries_collection):
         self.rsd.get_registries_collection()
         mock_registries_collection.assert_called_once_with(
             self.rsd._conn, '/redfish/v1/Registries',
             redfish_version=self.rsd.redfish_version)
 
-    @mock.patch.object(v2_1_registries, 'Registries', autospec=True)
+    @mock.patch.object(v2_1_registries, 'MessageRegistryFile', autospec=True)
     def test_get_registries(self, mock_registries_service):
         self.rsd.get_registries('fake-registries-id')
         mock_registries_service.assert_called_once_with(
diff --git a/rsd_lib/tests/unit/resources/v2_3/test_rsdlib_v2_3.py b/rsd_lib/tests/unit/resources/v2_3/test_rsdlib_v2_3.py
index 8e41517..1854047 100644
--- a/rsd_lib/tests/unit/resources/v2_3/test_rsdlib_v2_3.py
+++ b/rsd_lib/tests/unit/resources/v2_3/test_rsdlib_v2_3.py
@@ -20,7 +20,8 @@ import testtools
 from rsd_lib.resources.v2_1.chassis import chassis as v2_1_chassis
 from rsd_lib.resources.v2_1.event_service import event_service \
     as v2_1_event_service
-from rsd_lib.resources.v2_1.registries import registries as v2_1_registries
+from rsd_lib.resources.v2_1.registries import message_registry_file \
+    as v2_1_registries
 from rsd_lib.resources.v2_1.task import task_service as v2_1_task_service
 from rsd_lib.resources.v2_2.update_service import update_service \
     as v2_2_update_service
@@ -181,14 +182,15 @@ class RSDLibV2_3TestCase(testtools.TestCase):
             self.rsd._conn, '/redfish/v1/TaskService',
             redfish_version=self.rsd.redfish_version)
 
-    @mock.patch.object(v2_1_registries, 'RegistriesCollection', autospec=True)
+    @mock.patch.object(
+        v2_1_registries, 'MessageRegistryFileCollection', autospec=True)
     def test_get_registries_collection(self, mock_registries_collection):
         self.rsd.get_registries_collection()
         mock_registries_collection.assert_called_once_with(
             self.rsd._conn, '/redfish/v1/Registries',
             redfish_version=self.rsd.redfish_version)
 
-    @mock.patch.object(v2_1_registries, 'Registries', autospec=True)
+    @mock.patch.object(v2_1_registries, 'MessageRegistryFile', autospec=True)
     def test_get_registries(self, mock_registries_service):
         self.rsd.get_registries('fake-registries-id')
         mock_registries_service.assert_called_once_with(
diff --git a/rsd_lib/tests/unit/resources/v2_4/test_rsdlib_v2_4.py b/rsd_lib/tests/unit/resources/v2_4/test_rsdlib_v2_4.py
index e4022ff..b566d3e 100644
--- a/rsd_lib/tests/unit/resources/v2_4/test_rsdlib_v2_4.py
+++ b/rsd_lib/tests/unit/resources/v2_4/test_rsdlib_v2_4.py
@@ -20,7 +20,8 @@ import testtools
 from rsd_lib.resources.v2_1.chassis import chassis as v2_1_chassis
 from rsd_lib.resources.v2_1.event_service import event_service \
     as v2_1_event_service
-from rsd_lib.resources.v2_1.registries import registries as v2_1_registries
+from rsd_lib.resources.v2_1.registries import message_registry_file \
+    as v2_1_registries
 from rsd_lib.resources.v2_1.task import task_service as v2_1_task_service
 from rsd_lib.resources.v2_2.update_service import update_service \
     as v2_2_update_service
@@ -181,14 +182,15 @@ class RSDLibV2_3TestCase(testtools.TestCase):
             self.rsd._conn, '/redfish/v1/TaskService',
             redfish_version=self.rsd.redfish_version)
 
-    @mock.patch.object(v2_1_registries, 'RegistriesCollection', autospec=True)
+    @mock.patch.object(
+        v2_1_registries, 'MessageRegistryFileCollection', autospec=True)
     def test_get_registries_collection(self, mock_registries_collection):
         self.rsd.get_registries_collection()
         mock_registries_collection.assert_called_once_with(
             self.rsd._conn, '/redfish/v1/Registries',
             redfish_version=self.rsd.redfish_version)
 
-    @mock.patch.object(v2_1_registries, 'Registries', autospec=True)
+    @mock.patch.object(v2_1_registries, 'MessageRegistryFile', autospec=True)
     def test_get_registries(self, mock_registries_service):
         self.rsd.get_registries('fake-registries-id')
         mock_registries_service.assert_called_once_with(