diff --git a/catalystwan/endpoints/endpoints_container.py b/catalystwan/endpoints/endpoints_container.py
index d7a4106e..4c570fea 100644
--- a/catalystwan/endpoints/endpoints_container.py
+++ b/catalystwan/endpoints/endpoints_container.py
@@ -83,8 +83,8 @@
 from catalystwan.endpoints.configuration_group import ConfigurationGroup
 from catalystwan.endpoints.configuration_settings import ConfigurationSettings
 from catalystwan.endpoints.misc import MiscellaneousEndpoints
-from catalystwan.endpoints.monitoring_device_details import MonitoringDeviceDetails
-from catalystwan.endpoints.monitoring_status import MonitoringStatus
+from catalystwan.endpoints.monitoring.device_details import MonitoringDeviceDetails
+from catalystwan.endpoints.monitoring.status import MonitoringStatus
 from catalystwan.endpoints.monitoring.server_info import ServerInfo
 from catalystwan.endpoints.real_time_monitoring.reboot_history import RealTimeMonitoringRebootHistory
 from catalystwan.endpoints.sdavc_cloud_connector import SDAVCCloudConnector
diff --git a/catalystwan/endpoints/monitoring_device_details.py b/catalystwan/endpoints/monitoring/device_details.py
similarity index 100%
rename from catalystwan/endpoints/monitoring_device_details.py
rename to catalystwan/endpoints/monitoring/device_details.py
diff --git a/catalystwan/endpoints/monitoring/server_info.py b/catalystwan/endpoints/monitoring/server_info.py
index cd14ee0b..a7e0b902 100644
--- a/catalystwan/endpoints/monitoring/server_info.py
+++ b/catalystwan/endpoints/monitoring/server_info.py
@@ -7,6 +7,6 @@
 
 
 class ServerInfo(APIEndpoints):
-    @get("server/info")
+    @get("/server/info")
     def get_server_info(self) -> ServerInfoResponse:
         ...
diff --git a/catalystwan/endpoints/monitoring_status.py b/catalystwan/endpoints/monitoring/status.py
similarity index 100%
rename from catalystwan/endpoints/monitoring_status.py
rename to catalystwan/endpoints/monitoring/status.py
diff --git a/catalystwan/models/monitoring/server_info.py b/catalystwan/models/monitoring/server_info.py
index 1c5feec9..444cf4ab 100644
--- a/catalystwan/models/monitoring/server_info.py
+++ b/catalystwan/models/monitoring/server_info.py
@@ -6,5 +6,7 @@
 class ServerInfoResponse(BaseModel):
     """The response may contain an incorrect spelling "Achitecture"."""
 
-    Architecture: str = Field(..., alias="Achitecture")
-    Available_processors: int
+    architecture: str = Field(..., alias="Achitecture")
+    available_processors: int = Field(
+        ..., serialization_alias="Available processors", validation_alias="Available processors"
+    )