diff --git a/sushy/resources/mappings.py b/sushy/resources/mappings.py
index c0819829..8afad7e1 100644
--- a/sushy/resources/mappings.py
+++ b/sushy/resources/mappings.py
@@ -35,7 +35,7 @@ HEALTH_VALUE_MAP = {
 HEALTH_VALUE_MAP_REV = (
     utils.revert_dictionary(HEALTH_VALUE_MAP))
 
-PARAMTYPE_MAP = {
+PARAMTYPE_VALUE_MAP = {
     'string': res_cons.PARAMTYPE_STRING,
     'number': res_cons.PARAMTYPE_NUMBER
 }
diff --git a/sushy/resources/registry/messageregistry.py b/sushy/resources/registry/message_registry.py
similarity index 96%
rename from sushy/resources/registry/messageregistry.py
rename to sushy/resources/registry/message_registry.py
index a5d80b5e..d09a9ea1 100644
--- a/sushy/resources/registry/messageregistry.py
+++ b/sushy/resources/registry/message_registry.py
@@ -37,7 +37,8 @@ class MessageDictionaryField(base.DictionaryField):
 
     param_types = base.Field('ParamTypes',
                              adapter=lambda x:
-                                 [res_maps.PARAMTYPE_MAP[v] for v in x])
+                                 [res_maps.PARAMTYPE_VALUE_MAP[v]
+                                  for v in x])
     """Mapped MessageArg types, in order, for the message"""
 
     resolution = base.Field('Resolution', required=True)
diff --git a/sushy/tests/unit/resources/registry/test_messageregistry.py b/sushy/tests/unit/resources/registry/test_message_registry.py
similarity index 96%
rename from sushy/tests/unit/resources/registry/test_messageregistry.py
rename to sushy/tests/unit/resources/registry/test_message_registry.py
index 59e2fc09..8669d443 100644
--- a/sushy/tests/unit/resources/registry/test_messageregistry.py
+++ b/sushy/tests/unit/resources/registry/test_message_registry.py
@@ -18,7 +18,7 @@ import json
 import mock
 
 from sushy.resources import constants as res_cons
-from sushy.resources.registry import messageregistry
+from sushy.resources.registry import message_registry
 from sushy.tests.unit import base
 
 
@@ -30,7 +30,7 @@ class MessageRegistryTestCase(base.TestCase):
         with open('sushy/tests/unit/json_samples/message_registry.json') as f:
             self.conn.get.return_value.json.return_value = json.load(f)
 
-        self.registry = messageregistry.MessageRegistry(
+        self.registry = message_registry.MessageRegistry(
             self.conn, '/redfish/v1/Registries/Test',
             redfish_version='1.0.2')