diff --git a/monkey/monkey_island/cc/models/netmap.py b/monkey/monkey_island/cc/models/networkmap.py
similarity index 83%
rename from monkey/monkey_island/cc/models/netmap.py
rename to monkey/monkey_island/cc/models/networkmap.py
index 4d482e686..4f40b9f8b 100644
--- a/monkey/monkey_island/cc/models/netmap.py
+++ b/monkey/monkey_island/cc/models/networkmap.py
@@ -7,11 +7,11 @@ from typing import Mapping, Sequence
 # Not sure how compatible this will be with ORM objects though,
 # might require more complex casting logic
 @dataclass
-class Netmap:
-    nodes: Mapping[str, Sequence[Arch]]
+class NetworkMap:
+    nodes: Mapping[str, Sequence[Arc]]
 
 
 @dataclass
-class Arch:
+class Arc:
     dst_machine: Machine
     status: str
diff --git a/monkey/monkey_island/cc/repository/INetMapRepository.py b/monkey/monkey_island/cc/repository/INetworkMapRepository.py
similarity index 82%
rename from monkey/monkey_island/cc/repository/INetMapRepository.py
rename to monkey/monkey_island/cc/repository/INetworkMapRepository.py
index ad3c0e1bb..8a53dd044 100644
--- a/monkey/monkey_island/cc/repository/INetMapRepository.py
+++ b/monkey/monkey_island/cc/repository/INetworkMapRepository.py
@@ -1,7 +1,7 @@
 from abc import ABC
 
 
-class INetMapRepository(ABC):
+class INetworkMapRepository(ABC):
 
     # TODO Define NetMap object
     def get_map(self) -> NetMap: