diff --git a/toscaparser/elements/entitytype.py b/toscaparser/elements/entity_type.py
similarity index 100%
rename from toscaparser/elements/entitytype.py
rename to toscaparser/elements/entity_type.py
diff --git a/toscaparser/elements/statefulentitytype.py b/toscaparser/elements/statefulentitytype.py
index a5cdc18..78b7067 100644
--- a/toscaparser/elements/statefulentitytype.py
+++ b/toscaparser/elements/statefulentitytype.py
@@ -12,7 +12,7 @@
 
 from toscaparser.common.exception import InvalidTypeError
 from toscaparser.elements.attribute_definition import AttributeDef
-from toscaparser.elements.entitytype import EntityType
+from toscaparser.elements.entity_type import EntityType
 from toscaparser.elements.property_definition import PropertyDef
 
 
diff --git a/toscaparser/functions.py b/toscaparser/functions.py
index 12cf31c..9ac2ce8 100644
--- a/toscaparser/functions.py
+++ b/toscaparser/functions.py
@@ -161,7 +161,7 @@ class GetAttribute(Function):
 
     def _find_host_containing_attribute(self, node_template_name=SELF):
         node_template = self._find_node_template(node_template_name)
-        from toscaparser.elements.entitytype import EntityType
+        from toscaparser.elements.entity_type import EntityType
         hosted_on_rel = EntityType.TOSCA_DEF[HOSTED_ON]
         for r in node_template.requirements:
             for requirement, target_name in r.items():
diff --git a/toscaparser/parameters.py b/toscaparser/parameters.py
index 7255427..0459e4d 100644
--- a/toscaparser/parameters.py
+++ b/toscaparser/parameters.py
@@ -17,7 +17,7 @@ from toscaparser.common.exception import MissingRequiredFieldError
 from toscaparser.common.exception import UnknownFieldError
 from toscaparser.dataentity import DataEntity
 from toscaparser.elements.constraints import Schema
-from toscaparser.elements.entitytype import EntityType
+from toscaparser.elements.entity_type import EntityType
 from toscaparser.utils.gettextutils import _