diff --git a/dataproc/api/models/__pycache__/computationhost_model.cpython-38.pyc b/dataproc/api/models/__pycache__/computationhost_model.cpython-38.pyc
index e38cb55907e9956adbb8d6ca021d99024a91fba3..f4fc417b6e4c4a7b9026533fb13b66aa150d54db 100644
Binary files a/dataproc/api/models/__pycache__/computationhost_model.cpython-38.pyc and b/dataproc/api/models/__pycache__/computationhost_model.cpython-38.pyc differ
diff --git a/dataproc/api/models/__pycache__/storagehost_model.cpython-38.pyc b/dataproc/api/models/__pycache__/storagehost_model.cpython-38.pyc
index 5e54815988436463972734ea5e9f962b5e288639..3a86a6a4485b82ffcf50f31ab16140c2b0f838c9 100644
Binary files a/dataproc/api/models/__pycache__/storagehost_model.cpython-38.pyc and b/dataproc/api/models/__pycache__/storagehost_model.cpython-38.pyc differ
diff --git a/dataproc/api/models/computationhost_model.py b/dataproc/api/models/computationhost_model.py
index fef80759d20e6a88268a3d5c10dec8432e91dc09..7d97e54f30504bf605a413d55e956f6503995a65 100644
--- a/dataproc/api/models/computationhost_model.py
+++ b/dataproc/api/models/computationhost_model.py
@@ -1,12 +1,13 @@
-from neomodel import StructuredNode, StringProperty, IntegerProperty,UniqueIdProperty, RelationshipTo
+# Import libraries
+from neomodel import StructuredNode, StringProperty, IntegerProperty, UniqueIdProperty, RelationshipTo
 from uuid import uuid4
 
 class ComputationHost(StructuredNode):
 	ip=StringProperty()
 	uuid=StringProperty(unique_index=True, default=uuid4)
-	hostname=StringProperty()
+	hostName=StringProperty()
 	friendlyName=StringProperty()
-	workingdirectory=StringProperty()
+	workingDirectory=StringProperty()
 
 	@property
 	def serialize(self):
@@ -16,7 +17,7 @@ class ComputationHost(StructuredNode):
 		"""
 		
 		return {
-			'node_properties': {
+			'computationhost_node_properties': {
 				'ip': self.ip,
 				'uuid': self.uuid,
 				'hostName': self.hostName,
diff --git a/dataproc/api/models/storagehost_model.py b/dataproc/api/models/storagehost_model.py
index cd2ceacce0e34ded998e29a02b23ac7e1a437f97..dbea323aa9d2d74d9612f56d55078b875e27d96e 100644
--- a/dataproc/api/models/storagehost_model.py
+++ b/dataproc/api/models/storagehost_model.py
@@ -1,4 +1,4 @@
-from neomodel import StructuredNode, StringProperty, IntegerProperty,UniqueIdProperty, RelationshipTo
+from neomodel import StructuredNode, StringProperty, IntegerProperty, UniqueIdProperty, RelationshipTo
 from uuid import uuid4
 
 class StorageHost(StructuredNode):