diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbe97244..8ff23bb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,24 +53,24 @@ include_directories(/usr/local/include  /usr/local/opt/openssl/include src inclu
 
 add_executable( ucentralgw
                 build
-                src/uCentral.cpp src/uCentral.h src/RESTAPI_server.cpp src/RESTAPI_server.h
-                src/uCentralWebSocketServer.cpp src/uCentralWebSocketServer.h src/uSubSystemServer.cpp src/uSubSystemServer.h
-                src/uStorageService.cpp src/uStorageService.h src/uDeviceRegistry.cpp src/uDeviceRegistry.h
+                src/Daemon.cpp src/Daemon.h src/RESTAPI_server.cpp src/RESTAPI_server.h
+                src/WebSocketServer.cpp src/WebSocketServer.h src/SubSystemServer.cpp src/SubSystemServer.h
+                src/StorageService.cpp src/StorageService.h src/DeviceRegistry.cpp src/DeviceRegistry.h
                 src/RESTAPI_oauth2Handler.cpp src/RESTAPI_oauth2Handler.h src/RESTAPI_devices_handler.cpp src/RESTAPI_devices_handler.h
                 src/RESTAPI_device_handler.cpp src/RESTAPI_device_handler.h src/RESTAPI_unknownRequestHandler.cpp src/RESTAPI_unknownRequestHandler.h
                 src/RESTAPI_handler.cpp src/RESTAPI_handler.h src/RESTAPI_device_commandHandler.cpp src/RESTAPI_device_commandHandler.h
-                src/RESTAPI_objects.h src/RESTAPI_objects.cpp src/uAuthService.cpp src/uAuthService.h src/uCentralConfig.cpp src/uCentralConfig.h
+                src/RESTAPI_objects.h src/RESTAPI_objects.cpp src/AuthService.cpp src/AuthService.h src/CentralConfig.cpp src/CentralConfig.h
                 src/RESTAPI_default_configuration.cpp
                 src/RESTAPI_default_configuration.h src/RESTAPI_default_configurations.cpp src/RESTAPI_default_configurations.h src/RESTAPI_commands.cpp
-                src/RESTAPI_commands.h src/uCommandManager.cpp src/uCommandManager.h src/RESTAPI_command.cpp src/RESTAPI_command.h
-                src/uFileUploader.cpp src/uFileUploader.h src/RESTAPI_file.cpp src/RESTAPI_file.h src/uCommandChannel.cpp src/uCommandChannel.h
-                src/RESTAPI_system_command.cpp src/RESTAPI_system_command.h src/RESTAPI_BlackList.cpp src/RESTAPI_BlackList.h src/uUtils.h src/uUtils.cpp src/storage_blacklist.cpp src/storage_identity.cpp
+                src/RESTAPI_commands.h src/CommandManager.cpp src/CommandManager.h src/RESTAPI_command.cpp src/RESTAPI_command.h
+                src/FileUploader.cpp src/FileUploader.h src/RESTAPI_file.cpp src/RESTAPI_file.h src/CommandChannel.cpp src/CommandChannel.h
+                src/RESTAPI_system_command.cpp src/RESTAPI_system_command.h src/RESTAPI_BlackList.cpp src/RESTAPI_BlackList.h src/Utils.h src/Utils.cpp src/storage_blacklist.cpp src/storage_identity.cpp
                 src/storage_command.cpp src/storage_healthcheck.cpp src/storage_statistics.cpp src/storage_logs.cpp
                 src/storage_device.cpp src/storage_capabilities.cpp src/storage_defconfig.cpp src/storage_sqlite.cpp
                 src/storage_mysql.cpp src/storage_pgql.cpp src/storage_odbc.cpp src/storage_tables.cpp src/RESTAPI_callback.cpp
-                src/RESTAPI_callback.h src/uCallbackManager.cpp src/uCallbackManager.h src/uFirmwareManager.cpp
-                src/uFirmwareManager.h src/storage_firmware_updates.cpp src/uStateProcessor.cpp src/uStateProcessor.h
-                src/storage_lifetime_stats.cpp src/uCentralProtocol.cpp src/uCentralProtocol.h src/RESTAPI_protocol.h
+                src/RESTAPI_callback.h src/CallbackManager.cpp src/CallbackManager.h src/FirmwareManager.cpp
+                src/FirmwareManager.h src/storage_firmware_updates.cpp src/StateProcessor.cpp src/StateProcessor.h
+                src/storage_lifetime_stats.cpp src/uCentralProtocol.h src/RESTAPI_protocol.h
                 src/ALBHealthCheckServer.h src/kafka_topics.h)
 
 if(NOT SMALL_BUILD)
diff --git a/README.md b/README.md
index 2682df45..69f68084 100644
--- a/README.md
+++ b/README.md
@@ -402,6 +402,12 @@ Speficy where logs should be kept. You must include an existing directory and a
 ##### umask
 Seet the umask for the running service.
 
+### ALB Support
+Support for AWS ALB is provided through the following configuration elements
+```asm
+alb.enable = true
+alb.port = 15015
+```
 
 ### Docker
 So building this thing from scratch is not your thing? I can't blame you. It takes some patience and 
@@ -530,6 +536,7 @@ Toe read more about Kafka, follow the [document](https://github.com/Telecominfra
 
 #### Securing `kafka`
 This is beyond the scope of this document. As it stands today, the communication between the gateway and `kafka` is expected to be behind a firewall.
+
 ## Contributors
 We love ya! We need more of ya! If you want to contribute, make sure you review 
 the [coding style](https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/CODING_STYLE.md) document. 
diff --git a/build b/build
index e3f1e9b7..c147342c 100644
--- a/build
+++ b/build
@@ -1 +1 @@
-80
\ No newline at end of file
+81
\ No newline at end of file
diff --git a/ucentral.properties b/ucentral.properties
index 9f828c39..2f87ed19 100644
--- a/ucentral.properties
+++ b/ucentral.properties
@@ -80,15 +80,15 @@ rtty.viewport = 5913
 #
 # NLB Support
 #
-nlb.enable = true
-nlb.port = 15015
+alb.enable = true
+alb.port = 15015
 
 #
 # Kafka
 #
 ucentral.kafka.enable = false
 ucentral.kafka.brokerlist = 127.0.0.1:9092
-ucentral.kafka.commit = false
+ucentral.kafka.auto.commit = false
 ucentral.kafka.queue.buffering.max.ms = 50
 
 #