diff --git a/CDB/LOFAR_ConfigDb.json b/CDB/LOFAR_ConfigDb.json
index c37b09b85fa52b9d77300611f68e888668396951..b8dcb0bb74baf78e66e88374b4319dcd7b5ff448 100644
--- a/CDB/LOFAR_ConfigDb.json
+++ b/CDB/LOFAR_ConfigDb.json
@@ -426,10 +426,10 @@
                 }
             }
         },
-        "RandomData": {
+        "random_data": {
             "LTS": {
-                "RandomData": {
-                    "LTS/RandomData/1": {
+                "Random_Data": {
+                    "LTS/random_data/1": {
                         "properties": {
                             "polled_attr": [
                                 "rnd1",
@@ -479,7 +479,7 @@
                             ]
                         }
                     },
-                    "LTS/RandomData/2": {
+                    "LTS/random_data/2": {
                         "properties": {
                             "polled_attr": [
                                 "rnd1",
diff --git a/devices/test/devices/random_data.py b/devices/test/devices/random_data.py
index 3ebff8615da1d11ffbf404fd7de2e96263b7b38a..a22d8f6cc4b810bf432c4148a8d7f5ca41031917 100644
--- a/devices/test/devices/random_data.py
+++ b/devices/test/devices/random_data.py
@@ -19,9 +19,9 @@ from tango import DevState
 from tango.server import run, Device, attribute, command
 from numpy import random
 
-__all__ = ["RandomData", "main"]
+__all__ = ["Random_Data", "main"]
 
-class RandomData(Device):
+class Random_Data(Device):
     """
     Random data monitor point device
     """
@@ -467,7 +467,7 @@ def main(args = None, **kwargs):
     """
     Main function of the RandomData module.
     """
-    return run((RandomData,), args = args, **kwargs)
+    return run((Random_Data,), args = args, **kwargs)
 
 if __name__ == '__main__':
     main()