diff --git a/goblin/api.py b/goblin/api.py
index 91a1b37508a61251f3d844e9371ba8a6bd33161a..43d3ba4c94e6f12c275c34fae135c2e197aeb132 100644
--- a/goblin/api.py
+++ b/goblin/api.py
@@ -212,7 +212,7 @@ class ElementMeta(type):
                 v = properties.PropertyDescriptor(v.data_type)
             new_namespace[k] = v
         new_namespace['__mapping__'] = mapper.create_mapping(namespace,
-                                                              props)
+                                                             props)
         result = type.__new__(cls, name, bases, new_namespace)
         return result
 
diff --git a/goblin/mapper.py b/goblin/mapper.py
index ac3bfaf70a4839cd433b8745891b058ee67bdf21..bf54b2cb8f2e565c31547c5be2cc12c517de7eab 100644
--- a/goblin/mapper.py
+++ b/goblin/mapper.py
@@ -48,7 +48,7 @@ class VertexMapping:
 
     def __init__(self, namespace, properties):
         self._label = namespace.get('__label__', None)
-        self._type = 'vertex'
+        self._type = namespace['__type__']
         self._properties = []
         self._map_properties(properties)