From 84b32d965991b19471a5d0ff592b3f4e7733eacc Mon Sep 17 00:00:00 2001
From: Anton Joubert <ajoubert@ska.ac.za>
Date: Fri, 14 Sep 2018 10:03:29 +0200
Subject: [PATCH] Change levpro references to lmc-base-classes

Most of the references have been changed.  Still WIP - not tested
yet.

Related to issue: #78
---
 Jenkinsfile                                   | 10 ++---
 README.md                                     |  2 +-
 ansible/README.md                             | 44 +++++++++----------
 .../config_files/config_starter.json.j2       |  2 +-
 .../config_files/config_starter.json.j2       |  2 +-
 .../config_files/config_starter.json.j2       |  2 +-
 .../refelt_config_starter.json.j2             |  2 +-
 ansible/library/register_refelt.py            |  2 +-
 ansible/roles/deploy_sw/README.md             |  2 +-
 ansible/roles/deploy_sw/tasks/main.yml        | 26 +++++------
 .../config_files/tango_config_starter.json    |  2 +-
 ansible/roles/generate_sw/tasks/main.yml      |  6 +--
 ansible/roles/install_sw/tasks/main.yml       | 30 ++++++-------
 ansible/roles/refresh_sw/tasks/main.yml       |  6 +--
 .../roles/register_my_refelt/tasks/main.yml   |  6 +--
 ansible/roles/register_refelt/tasks/main.yml  |  6 +--
 docker/README.md                              | 26 +++++------
 refelt/refelt/Pdu.xmi                         |  2 +-
 refelt/refelt/Rack.xmi                        |  2 +-
 refelt/refelt/RefA.xmi                        |  2 +-
 refelt/refelt/RefAchild.xmi                   |  2 +-
 refelt/refelt/RefAlarmHandler.xmi             |  2 +-
 refelt/refelt/RefB.xmi                        |  2 +-
 refelt/refelt/RefBchild.xmi                   |  2 +-
 refelt/refelt/RefCapabilityA.xmi              |  2 +-
 refelt/refelt/RefMaster.xmi                   |  2 +-
 refelt/refelt/RefSubarray.xmi                 |  2 +-
 refelt/refelt/RefTelState.xmi                 |  2 +-
 refelt/refelt/Server.xmi                      |  2 +-
 refelt/refelt/Switch.xmi                      |  2 +-
 refelt/release.py                             |  2 +-
 sandbox/refelt_config_starter.json            |  2 +-
 setup.py                                      |  9 ++--
 skabase/SKAAlarmHandler/SKAAlarmHandler.xmi   |  2 +-
 skabase/SKABaseDevice/SKABaseDevice.xmi       |  2 +-
 skabase/SKACapability/SKACapability.xmi       |  2 +-
 skabase/SKALogger/SKALogger.xmi               |  2 +-
 skabase/SKAMaster/SKAMaster.xmi               |  2 +-
 skabase/SKAObsDevice/SKAObsDevice.xmi         |  2 +-
 skabase/SKASubarray/SKASubarray.xmi           |  2 +-
 skabase/SKATelState/SKATelState.xmi           |  2 +-
 skabase/SKATestDevice/SKATestDevice.xmi       |  2 +-
 42 files changed, 116 insertions(+), 117 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1e58ed31..1259c839 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 node('docker') {
 
     withDockerContainer(
-        image: 'tango-levpro:latest',
+        image: 'tango-lmc-base-classes:latest',
         args: '-u root'
     ) {
         stage 'Cleanup workspace'
@@ -23,9 +23,9 @@ node('docker') {
                 timeout(time: 30, unit: 'MINUTES') {
                     ansiColor('xterm') {
                         try {
-                            // Add a symbolic link to levpro dir, as the Ansible scripts
+                            // Add a symbolic link to lmc-base-classes dir, as the Ansible scripts
                             // assume that is part of the path
-                            sh 'ln -sv $WORKSPACE ../levpro'
+                            sh 'ln -sv $WORKSPACE ../lmc-base-classes'
 
                             // use Ansible to do pip installs, using current WORKSPACE
                             // as the software_root
@@ -35,14 +35,14 @@ node('docker') {
                                 cd ansible
                                 ansible-playbook -i hosts install_sw.yml \
                                   --limit "local" \
-                                  --tags install-sw-levpro \
+                                  --tags install-sw-lmc-base-classes \
                                   --tags install-sw-skabase \
                                   --verbose \
                                   --extra-vars software_root=$PARENT_DIR
                                 pip install coverage
                                 cd ..
                             '''
-                            
+
                             catchError {
                                 // run tests
                                 sh '''
diff --git a/README.md b/README.md
index 81697c6a..1b95b401 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Early work in this repo was done as part of the LMC Base Classes Evolutionary Pr
 
 ## Docs
 - SKA Control System guidelines:  [Google docs folder](https://drive.google.com/drive/folders/0B8fhAW5QnZQWQ2ZlcjhVS0NmRms)
-- LEvPro work area: [Google docs folder](https://drive.google.com/drive/folders/0B8fhAW5QnZQWVHVFVGVXT2Via28)
+- Old LEvPro work area: [Google docs folder](https://drive.google.com/drive/folders/0B8fhAW5QnZQWVHVFVGVXT2Via28)
 
 ## Contribute
 Contributions are always welcome! Please ensure that you adhere to our coding standards [CAM_Style_guide](https://docs.google.com/document/d/1aZoIyR9tz5rCWr2qJKuMTmKp2IzHlFjrCFrpDDHFypM/edit?usp=sharing).  Use [flake8](http://flake8.pycqa.org/en/latest/) for linting (default settings, except maximum line length of 90 characters).
diff --git a/ansible/README.md b/ansible/README.md
index b3523393..125f8929 100644
--- a/ansible/README.md
+++ b/ansible/README.md
@@ -18,13 +18,13 @@ Get the desired inventories from ansible variables instead of loading files
 # To get going with a fresh node (Docker container):
 
 ## Run a Docker container:
-Follow the steps in `../docker/README.md`.  Launch the docker with the levpro project mounted inside the container.
+Follow the steps in `../docker/README.md`.  Launch the docker with the lmc-base-classes project mounted inside the container.
 
-Obviously any changes made inside the container, e.g. software installed, will not persist.  Images can be made from a running container, if you want to keep changes (read the Docker docs).  Note that changes to the files in the levpro project will persist, because these files live on the host machine, and are just mounted inside the container.  
+Obviously any changes made inside the container, e.g. software installed, will not persist.  Images can be made from a running container, if you want to keep changes (read the Docker docs).  Note that changes to the files in the lmc-base-classes project will persist, because these files live on the host machine, and are just mounted inside the container.  
 
-## Install the levpro python modules and register TANGO devices
+## Install the lmc-base-classes python modules and register TANGO devices
 ```
-cd ~/src/levpro/ansible
+cd ~/src/lmc-base-classes/ansible
 ./play-task.sh install-sw
 ./play-task.sh generate-sw-refelt-simlib
 ./play-task.sh register-my-refelt local  # startup can take 5 minutes!
@@ -34,7 +34,7 @@ Note: `register-refelt` is deprecated.
 
 ## Updating after .xmi file changes (POGO generation)
 ```
-cd ~/src/levpro/ansible
+cd ~/src/lmc-base-classes/ansible
 ./play-task.sh deregister_refelts.yml
 ./play-task.sh generate-sw
 ./play-task.sh register-my-refelt local
@@ -65,12 +65,12 @@ sudo add-apt-repository ppa:ansible/ansible
 sudo apt-get update
 sudo apt-get install ansible
 mkdir ~/src
-git clone https://github.com/ska-sa/levpro ~/src/levpro
+git clone https://github.com/ska-telescope/lmc-base-classes ~/src/lmc-base-classes
 ```
 
-## Deploy tangobox and a levpro RefElt on a fresh node
+## Deploy tangobox and a lmc-base-classes RefElt on a fresh node
 ```
-cd ~/src/levpro/ansible
+cd ~/src/lmc-base-classes/ansible
 ./play-task.sh deploy-tangobox
 ./play-task.sh deploy-sw
 ./play-task.sh generate-sw
@@ -83,7 +83,7 @@ Optional:
 
 ## Updating after .xmi file changes (POGO generation)
 ```
-cd ~/src/levpro/ansible
+cd ~/src/lmc-base-classes/ansible
 ./play-task.sh deregister_refelts.yml
 ./play-task.sh generate-sw
 ./play-task.sh register-my-refelt local
@@ -137,7 +137,7 @@ or using ansible-playbook directly
 ansible-playbook -i hosts install_sw.yml --list-tags [--limit devXX]
 ansible-playbook -i hosts install_sw.yml --list-hosts [--limit devXX]
 ansible-playbook -i hosts install_sw.yml
-ansible-playbook -i hosts install_sw.yml -t install-sw-levpro
+ansible-playbook -i hosts install_sw.yml -t install-sw-lmc-base-classes
 ```
 
 ### To deploy SW on local: # Git clone if not available, else git pull
@@ -152,25 +152,25 @@ ansible-playbook -i hosts site.yml --limit local --tags "deploy-sw"
 ### To refresh SW on local: # Git pull
 ```
 ./play-task.sh refresh-sw
-./play-task.sh refresh-sw-levpro
+./play-task.sh refresh-sw-lmc-base-classes
 ```
 or using ansible-playbook directly
 ```
 ansible-playbook -i hosts site.yml --limit local --tags "refresh-sw"
-ansible-playbook -i hosts site.yml --limit local --tags "refresh-sw-levpro"
+ansible-playbook -i hosts site.yml --limit local --tags "refresh-sw-lmc-base-classes"
 ```
 
 ### To install SW on local: # sudo pip install
 ```
 ./play-task.sh install-sw
-./play-task.sh install-sw-levpro
+./play-task.sh install-sw-lmc-base-classes
 ./play-task.sh install-sw-skabase
 ./play-task.sh install-sw-refelt
 ```
 or using ansible-playbook directly
 ```
 ansible-playbook -i hosts site.yml --limit local --tags "install-sw" # all
-ansible-playbook -i hosts site.yml --limit local --tags "install-sw-levpro"
+ansible-playbook -i hosts site.yml --limit local --tags "install-sw-lmc-base-classes"
 ansible-playbook -i hosts site.yml --limit local --tags "install-sw-skabase"
 ansible-playbook -i hosts site.yml --limit local --tags "install-sw-refelt"
 ```
@@ -179,7 +179,7 @@ ansible-playbook -i hosts site.yml --limit local --tags "install-sw-refelt"
 ### To regenerate POGO output
 When XMI or code has been changed
 ```
-cd ~/src/levpro/ansible
+cd ~/src/lmc-base-classes/ansible
 ./play-task.sh generate-sw
 ```
 
@@ -194,7 +194,7 @@ or
 ```
 
 ### To configure a specific RefEltX TANGO facility and start its device servers (my_refelt)
-You need to add the group to levpro/ansible/hosts e.g.
+You need to add the group to lmc-base-classes/ansible/hosts e.g.
 ```
 [devXX]
 devXXlevpro
@@ -259,11 +259,11 @@ role-tag defined in in roles/xxx/tasks/main.yml followed by a task specialisatio
 E.g. any tag starting with deploy-sw will be found in the deploy_sw.yml role
 ```
     tags:
-       - deploy-sw-levpro
+       - deploy-sw-lmc-base-classes
 ```
 To execute a specific task specify the full --tags from the task file e.g.
 ```
-     --tags deploy-sw-levpro
+     --tags deploy-sw-lmc-base-classes
 ```
 Format is "<role-tag>-<task-id>" e.g. install-sw-refelt
 ```
@@ -275,7 +275,7 @@ To list the current task tags:
 ```
 ./play-task.sh
 
-kat@levpro.devXX.camlab.kat.ac.za:~/src/levpro/ansible$ ./play-task.sh
+kat@levpro.devXX.camlab.kat.ac.za:~/src/lmc-base-classes/ansible$ ./play-task.sh
 You have to specify a roletag, and optional task-id
 
 ---------------------------<<<< ANSIBLE COMMAND LINE >>>>--------------------------------------------
@@ -287,16 +287,16 @@ The available task tags are:
 playbook: site.yml
 
   play #1 (operational): deploy_sw	TAGS: []
-      TASK TAGS: [deploy-sw, deploy-sw-levpro]
+      TASK TAGS: [deploy-sw, deploy-sw-lmc-base-classes]
 
   play #2 (operational): deploy_tangobox	TAGS: []
       TASK TAGS: [debs, deploy-box-tango-java, deploy-tangobox, deploy-tangobox-debs, deploy-tangobox-itango, deploy-tangobox-mysql, deploy-tangobox-mysql-installed, deploy-tangobox-pip, deploy-tangobox-start-tango, deploy-tangobox-tango-core, deploy-tangobox-tango-java, deploy-tangobox-tango-java-pogo, deploy-tangobox-tango-webapp, itango, mysql, pip, tango-core, tango-java]
 
   play #3 (operational): install_sw	TAGS: []
-      TASK TAGS: [install-sw, install-sw-levpro, install-sw-refelt, install-sw-skabase]
+      TASK TAGS: [install-sw, install-sw-lmc-base-classes, install-sw-refelt, install-sw-skabase]
 
   play #4 (operational): refresh_sw	TAGS: []
-      TASK TAGS: [refresh-sw, refresh-sw-levpro]
+      TASK TAGS: [refresh-sw, refresh-sw-lmc-base-classes]
 
   play #5 (operational): register_refelt	TAGS: []
       TASK TAGS: [register-refelt, register-refelt-in-astor, register-refelt-in-astor-ds-path, register-refelt-in-tangodb]
diff --git a/ansible/inventories/refelt/config_files/config_starter.json.j2 b/ansible/inventories/refelt/config_files/config_starter.json.j2
index 0f304e0e..4a405cf3 100644
--- a/ansible/inventories/refelt/config_files/config_starter.json.j2
+++ b/ansible/inventories/refelt/config_files/config_starter.json.j2
@@ -1,7 +1,7 @@
 {
     "api_version": "v1",
     "tango_hosts": {
-          "levpro": [
+          "lmc-base-classes": [
               {
                   "startup_level": 1,
                   "server_instances": ["SKALogger/{{ my_instance }}", "SKALogger/Central"]
diff --git a/ansible/inventories/refelt4/config_files/config_starter.json.j2 b/ansible/inventories/refelt4/config_files/config_starter.json.j2
index ebc486e3..73eb7e94 100644
--- a/ansible/inventories/refelt4/config_files/config_starter.json.j2
+++ b/ansible/inventories/refelt4/config_files/config_starter.json.j2
@@ -1,7 +1,7 @@
 {
     "api_version": "v1",
     "tango_hosts": {
-          "levpro": [
+          "lmc-base-classes": [
               {
                   "startup_level": 1,
                   "server_instances": ["SKALogger/{{ my_instance }}", "SKALogger/Central"]
diff --git a/ansible/inventories/refelt5/config_files/config_starter.json.j2 b/ansible/inventories/refelt5/config_files/config_starter.json.j2
index 62837d4b..c1fcb64b 100644
--- a/ansible/inventories/refelt5/config_files/config_starter.json.j2
+++ b/ansible/inventories/refelt5/config_files/config_starter.json.j2
@@ -1,7 +1,7 @@
 {
     "api_version": "v1",
     "tango_hosts": {
-          "levpro": [
+          "lmc-base-classes": [
               {
                   "startup_level": 1,
                   "server_instances": ["SKALogger/{{ my_instance }}", "SKALogger/Central"]
diff --git a/ansible/inventories/refelt_template/refelt_config_starter.json.j2 b/ansible/inventories/refelt_template/refelt_config_starter.json.j2
index 9b921a57..bd7a1c45 100644
--- a/ansible/inventories/refelt_template/refelt_config_starter.json.j2
+++ b/ansible/inventories/refelt_template/refelt_config_starter.json.j2
@@ -1,7 +1,7 @@
 {
     "api_version": "v1",
     "tango_hosts": {
-          "levpro": [
+          "lmc-base-classes": [
               {
                   "startup_level": 1,
                   "server_instances": ["SKALogger/{{ my_instance }}", "SKALogger/Central"]
diff --git a/ansible/library/register_refelt.py b/ansible/library/register_refelt.py
index ebf55ee6..89daff76 100644
--- a/ansible/library/register_refelt.py
+++ b/ansible/library/register_refelt.py
@@ -36,7 +36,7 @@ from fandango import Astor
 
 DEFAULT_REFELT_ASTOR_CONFIG = dict(
 #node: {level: (server/instance,server/instance,...)}
-    { "levpro": {
+    { "lmc-base-classes": {
         0: ("TangoAccessControl/1",),
         1: ("SvrFileLogger/Central",),
         2: ("SvrFileLogger/Elt",),
diff --git a/ansible/roles/deploy_sw/README.md b/ansible/roles/deploy_sw/README.md
index 1b0f22a3..f4028dd0 100644
--- a/ansible/roles/deploy_sw/README.md
+++ b/ansible/roles/deploy_sw/README.md
@@ -1,3 +1,3 @@
 deploy_sw
 ---------
-This role deploys software packages for RefElt - levpro
+This role deploys software packages for RefElt (reference element)
diff --git a/ansible/roles/deploy_sw/tasks/main.yml b/ansible/roles/deploy_sw/tasks/main.yml
index 97c28c98..fb5dc5a5 100644
--- a/ansible/roles/deploy_sw/tasks/main.yml
+++ b/ansible/roles/deploy_sw/tasks/main.yml
@@ -11,24 +11,24 @@
 ##     Clone repos
 ###########################################
 
-## levpro
+## lmc-base-classes
 
-- name: Check for levpro in software_root
-  stat: path={{software_root}}/levpro
-  register: p_levpro
+- name: Check for lmc-base-classes in software_root
+  stat: path={{software_root}}/lmc-base-classes
+  register: p_lmc_base_classes
   tags:
-    - deploy-sw-levpro
+    - deploy-sw-lmc-base-classes
 
-- name: Clone levpro if dir not existing
-  command: git clone https://github.com/ska-sa/levpro {{software_root}}/levpro
-  when: not p_levpro.stat.exists
+- name: Clone lmc-base-classes if dir not existing
+  command: git clone https://github.com/ska-telescope/lmc-base-classes {{software_root}}/lmc-base-classes
+  when: not p_lmc_base_classes.stat.exists
   tags:
-    - deploy-sw-levpro
+    - deploy-sw-lmc-base-classes
 
-- name: Git pull levpro if dir exists
-  command: git -C {{software_root}}/levpro pull
-  when: p_levpro.stat.isdir is defined and p_levpro.stat.isdir
+- name: Git pull lmc-base-classes if dir exists
+  command: git -C {{software_root}}/lmc-base-classes pull
+  when: p_lmc_base_classes.stat.isdir is defined and p_lmc_base_classes.stat.isdir
   tags:
-    - deploy-sw-levpro
+    - deploy-sw-lmc-base-classes
 
 ...
diff --git a/ansible/roles/deploy_tangobox/config_files/tango_config_starter.json b/ansible/roles/deploy_tangobox/config_files/tango_config_starter.json
index d42d8d2f..9ef86d22 100644
--- a/ansible/roles/deploy_tangobox/config_files/tango_config_starter.json
+++ b/ansible/roles/deploy_tangobox/config_files/tango_config_starter.json
@@ -1,7 +1,7 @@
 {
     "api_version": "v1",
     "tango_hosts": {
-          "levpro": [
+          "lmc-base-classes": [
               {
                   "startup_level": 4,
                   "server_instances": ["TangoRestServer/rest"]
diff --git a/ansible/roles/generate_sw/tasks/main.yml b/ansible/roles/generate_sw/tasks/main.yml
index b649627d..c8f2c95c 100644
--- a/ansible/roles/generate_sw/tasks/main.yml
+++ b/ansible/roles/generate_sw/tasks/main.yml
@@ -16,7 +16,7 @@
   - name: Generate skabase
     command: pogo -src {{item}}.xmi
     args:
-        chdir: "{{software_root}}/levpro/skabase/{{item}}"
+        chdir: "{{software_root}}/lmc-base-classes/skabase/{{item}}"
     environment:
         DISPLAY: "localhost:1.0"
     with_items:
@@ -35,7 +35,7 @@
   - name: Generate refelt
     command: pogo -src {{item}}.xmi
     args:
-        chdir: "{{software_root}}/levpro/refelt/refelt"
+        chdir: "{{software_root}}/lmc-base-classes/refelt/refelt"
     environment:
         DISPLAY: "localhost:1.0"
     with_items:
@@ -60,7 +60,7 @@
     become: yes
     command: >
         tango-simlib-generator
-        --sim-data-file {{software_root}}/levpro/refelt/refelt/{{item}}.xmi
+        --sim-data-file {{software_root}}/lmc-base-classes/refelt/refelt/{{item}}.xmi
         --dserver-name SvrSim{{item}}
         --directory /usr/local/bin/
     with_items:
diff --git a/ansible/roles/install_sw/tasks/main.yml b/ansible/roles/install_sw/tasks/main.yml
index e818c50a..577e30e3 100644
--- a/ansible/roles/install_sw/tasks/main.yml
+++ b/ansible/roles/install_sw/tasks/main.yml
@@ -13,44 +13,44 @@
 ###########################################
 
 - block:
-  - name: Install levpro
-    #command: sudo pip install {{software_root}}/levpro -U --no-deps
+  - name: Install lmc-base-classes
+    #command: sudo pip install {{software_root}}/lmc-base-classes -U --no-deps
     pip:
       name: "{{software_root}}/{{item}}"
       extra_args: -U --no-deps
     with_items:
-      - levpro
+      - lmc-base-classes
   become: True
   tags:
-    - install-sw-levpro
+    - install-sw-lmc-base-classes
 
 - block:
   - name: Install skabase
-    #command: sudo pip install {{software_root}}/levpro/skabase/{{item}} -U --no-deps
+    #command: sudo pip install {{software_root}}/lmc-base-classes/skabase/{{item}} -U --no-deps
     pip:
       name: "{{software_root}}/{{item}}"
       extra_args: -U --no-deps
     with_items:
-      - levpro/skabase/SKABaseDevice
-      - levpro/skabase/SKAObsDevice
-      - levpro/skabase/SKAMaster
-      - levpro/skabase/SKASubarray
-      - levpro/skabase/SKACapability
-      - levpro/skabase/SKAAlarmHandler
-      - levpro/skabase/SKATelState
-      - levpro/skabase/SKALogger
+      - lmc-base-classes/skabase/SKABaseDevice
+      - lmc-base-classes/skabase/SKAObsDevice
+      - lmc-base-classes/skabase/SKAMaster
+      - lmc-base-classes/skabase/SKASubarray
+      - lmc-base-classes/skabase/SKACapability
+      - lmc-base-classes/skabase/SKAAlarmHandler
+      - lmc-base-classes/skabase/SKATelState
+      - lmc-base-classes/skabase/SKALogger
   become: True
   tags:
     - install-sw-skabase
 
 - block:
   - name: Install refelt
-    #command: sudo pip install {{software_root}}/levpro/refelt -U --no-deps
+    #command: sudo pip install {{software_root}}/lmc-base-classes/refelt -U --no-deps
     pip:
       name: "{{software_root}}/{{item}}"
       extra_args: -U --no-deps
     with_items:
-      - levpro/refelt
+      - lmc-base-classes/refelt
   become: True
   tags:
     - install-sw-refelt
diff --git a/ansible/roles/refresh_sw/tasks/main.yml b/ansible/roles/refresh_sw/tasks/main.yml
index 2821b9be..78df7e10 100644
--- a/ansible/roles/refresh_sw/tasks/main.yml
+++ b/ansible/roles/refresh_sw/tasks/main.yml
@@ -13,9 +13,9 @@
 
 # Do we want to pull on refresh_sw ???
 
-- name: Refresh levpro
-  command: git -C {{software_root}}/levpro pull
+- name: Refresh lmc-base-classes
+  command: git -C {{software_root}}/lmc-base-classes pull
   tags:
-    - refresh-sw-levpro
+    - refresh-sw-lmc-base-classes
 
 ...
diff --git a/ansible/roles/register_my_refelt/tasks/main.yml b/ansible/roles/register_my_refelt/tasks/main.yml
index 9e0ac4a8..137a6272 100644
--- a/ansible/roles/register_my_refelt/tasks/main.yml
+++ b/ansible/roles/register_my_refelt/tasks/main.yml
@@ -69,7 +69,7 @@
         # else ansible template processing replaces the double quotes with single qoutes
         # breaking the json
         # https://stackoverflow.com/questions/41144922/ansible-passing-json-string-in-environment-to-shell-module
-        var_config_db: " {{ lookup('template', '{{ software_root }}/levpro/ansible/inventories/{{ my_name }}/config_files/config_db.json.j2') | to_json }}"
+        var_config_db: " {{ lookup('template', '{{ software_root }}/lmc-base-classes/ansible/inventories/{{ my_name }}/config_files/config_db.json.j2') | to_json }}"
     register_element:
         config_json: "{{ var_config_db }}"
     register: the_result
@@ -77,7 +77,7 @@
   - name: Register MyRefElt device properties in TANGO db
     vars:
         # NOTE - the space before the double open curly brackets " {{..." is required - see above
-        var_config_properties: " {{ lookup('template', '{{ software_root}}/levpro/ansible/inventories/{{my_name}}/config_files/config_properties.json.j2') | to_json }}"
+        var_config_properties: " {{ lookup('template', '{{ software_root}}/lmc-base-classes/ansible/inventories/{{my_name}}/config_files/config_properties.json.j2') | to_json }}"
     register_properties:
         properties_json: "{{ var_config_properties }}"
     register: the_result
@@ -101,7 +101,7 @@
   - name: Register MyRefElt in Astor and restart with Starter
     vars:
         # NOTE - the space before the double open curly brackets " {{..." is required - see above
-        var_config_starter: " {{ lookup('template', '{{ software_root }}/levpro/ansible/inventories/{{ my_name }}/config_files/config_starter.json.j2') | to_json }}"
+        var_config_starter: " {{ lookup('template', '{{ software_root }}/lmc-base-classes/ansible/inventories/{{ my_name }}/config_files/config_starter.json.j2') | to_json }}"
     start_element:
       starter_json: "{{ var_config_starter }}"
     register: the_result
diff --git a/ansible/roles/register_refelt/tasks/main.yml b/ansible/roles/register_refelt/tasks/main.yml
index 361d5e2c..319e1c7a 100644
--- a/ansible/roles/register_refelt/tasks/main.yml
+++ b/ansible/roles/register_refelt/tasks/main.yml
@@ -23,11 +23,11 @@
 - block:
   - name: Register RefElt servers, classes, devices
     register_element:
-        elt_config_file: "{{software_root}}/levpro/ansible/inventories/refelt/config_files/config_db.json"
+        elt_config_file: "{{software_root}}/lmc-base-classes/ansible/inventories/refelt/config_files/config_db.json"
     register: the_result
   - name: Register RefElt properties
     register_properties:
-      elt_config_file: "{{software_root}}/levpro/ansible/inventories/refelt/config_files/device_properties.json"
+      elt_config_file: "{{software_root}}/lmc-base-classes/ansible/inventories/refelt/config_files/device_properties.json"
     register: the_result
   tags:
     - register-refelt-in-tangodb
@@ -50,7 +50,7 @@
 - block:
   - name: Register RefElt in Astor and restart with Starter
     start_element:
-      element_config: "{{software_root}}/levpro/ansible/inventories/refelt/config_files/config_starter.json"
+      element_config: "{{software_root}}/lmc-base-classes/ansible/inventories/refelt/config_files/config_starter.json"
     register: the_result
   tags:
     - register-refelt-in-astor
diff --git a/docker/README.md b/docker/README.md
index cac7fa07..636a111b 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,12 +1,12 @@
-# levpro-test (with ubuntu 14.04)
+# lmc-base-classes-test (with ubuntu 14.04)
 
-[Docker](http://www.docker.com) image configuration for testing [levpro](https://github.com/ska-sa/levpro).
+[Docker](http://www.docker.com) image configuration for testing [lmc-base-classes](https://github.com/ska-telescope/lmc-base-classes).
 
-It is based on a [Ubuntu](https://www.ubuntu.com/) 14.04 (trusty) and it provides the following infrastructure for installing and testing levpro:
+It is based on a [Ubuntu](https://www.ubuntu.com/) 14.04 (trusty) and it provides the following infrastructure for installing and testing lmc-base-classes:
 
 - xvfb, for headless GUI testing
-- levpro dependencies and recommended packages (PyTango, pytest, tango-simlib, Fandango, ...)
-- A Tango DB and TangoTest DS configured and running for testing levpro
+- lmc-base-classes dependencies and recommended packages (PyTango, pytest, tango-simlib, Fandango, ...)
+- A Tango DB and TangoTest DS configured and running for testing lmc-base-classes
 
 The primary use of this Docker image is to use it in our Continuous Integration workflow.
 But you may also run it on your own machine.
@@ -14,31 +14,31 @@ But you may also run it on your own machine.
 First build the image:
 
 ~~~~
-docker build . -t tango-levpro
+docker build . -t tango-lmc-base-classes
 ~~~~
 
 Start up the tango container:
 
 ~~~~
-docker run --rm --name levpro -it tango-levpro:latest
+docker run --rm --name lmc-base-classes -it tango-lmc-base-classes:latest
 ~~~~
 
-or start with levpro project (/home/user/src/levpro) mounted in container for development
+or start with lmc-base-classes project (/home/user/src/lmc-base-classes) mounted in container for development
 
 ~~~~
-docker run --rm --name levpro -v /home/user/src/levpro:/home/tango-cs/src/levpro -it tango-levpro:latest
+docker run --rm --name lmc-base-classes -v /home/user/src/lmc-base-classes:/home/tango-cs/src/lmc-base-classes -it tango-lmc-base-classes:latest
 ~~~~
 
 or if you want TANGO DB available outside the container, export the port
 
 ~~~~
-docker run --rm --name levpro -v /home/user/src/levpro:/home/tango-cs/src/levpro -p 10123:10000 -it tango-levpro:latest
+docker run --rm --name lmc-base-classes -v /home/user/src/lmc-base-classes:/home/tango-cs/src/lmc-base-classes -p 10123:10000 -it tango-lmc-base-classes:latest
 ~~~~
 
 Then you can log into the container with:
 
 ~~~~
-docker exec -it levpro bash
+docker exec -it lmc-base-classes bash
 ~~~~
 
 Connecting to the TANGO DB using jive
@@ -47,6 +47,6 @@ Connecting to the TANGO DB using jive
 env TANGO_HOST=localhost:10123 jive
 ~~~~
 
-Note: This image does not contain levpro itself (since it is designed for installing development versions of levpro) but you can
-install it easily **from your container** (for more details, see [LEvPro Deployment Notes](
+Note: This image does not contain lmc-base-classes itself (since it is designed for installing development versions of lmc-base-classes) but you can
+install it easily **from your container** (for more details, see old [LEvPro Deployment Notes](
 https://docs.google.com/document/d/12f495FEMOi0g3bJjoZL3icZaCCr7iSjTY3jToFqA2Ns/edit#heading=h.tzfrhvg9rcoo)).
diff --git a/refelt/refelt/Pdu.xmi b/refelt/refelt/Pdu.xmi
index c28c51cf..e46181dd 100644
--- a/refelt/refelt/Pdu.xmi
+++ b/refelt/refelt/Pdu.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="PDU" pogoRevision="9.6">
-    <description description="Ref (Reference Elt) PDU device" title="PDU" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description="Ref (Reference Elt) PDU device" title="PDU" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKABaseDevice" sourcePath="../../skabase/SKABaseDevice"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/refelt/Rack.xmi b/refelt/refelt/Rack.xmi
index f03eab3b..0c3935c3 100644
--- a/refelt/refelt/Rack.xmi
+++ b/refelt/refelt/Rack.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="Rack" pogoRevision="9.6">
-    <description description="Ref (Reference Elt) Rack device" title="Rack" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files" license="none" copyright="" hasMandatoryProperty="true" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description="Ref (Reference Elt) Rack device" title="Rack" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files" license="none" copyright="" hasMandatoryProperty="true" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKABaseDevice" sourcePath="../../skabase/SKABaseDevice"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/refelt/RefA.xmi b/refelt/refelt/RefA.xmi
index 2a9fdb9a..72633179 100644
--- a/refelt/refelt/RefA.xmi
+++ b/refelt/refelt/RefA.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="RefA" pogoRevision="9.6">
-    <description description="An Ref (Reference Elt) device of type A" title="RefA" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description="An Ref (Reference Elt) device of type A" title="RefA" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKABaseDevice" sourcePath="../../skabase/SKABaseDevice"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/refelt/RefAchild.xmi b/refelt/refelt/RefAchild.xmi
index 44bce2b9..aba28055 100644
--- a/refelt/refelt/RefAchild.xmi
+++ b/refelt/refelt/RefAchild.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="RefAchild" pogoRevision="9.6">
-    <description description="Ref (Reference Element) device of type Achild" title="RefAchild" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description="Ref (Reference Element) device of type Achild" title="RefAchild" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKABaseDevice" sourcePath="../../skabase/SKABaseDevice"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/refelt/RefAlarmHandler.xmi b/refelt/refelt/RefAlarmHandler.xmi
index b423482c..cb4d4f47 100644
--- a/refelt/refelt/RefAlarmHandler.xmi
+++ b/refelt/refelt/RefAlarmHandler.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="RefAlarmHandler" pogoRevision="9.6">
-    <description description="Ref (Reference Element) device of Type AlarmHandler" title="RefAlarmHandler" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description="Ref (Reference Element) device of Type AlarmHandler" title="RefAlarmHandler" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKAAlarmHandler" sourcePath="../../skabase/SKAAlarmHandler"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA"/>
diff --git a/refelt/refelt/RefB.xmi b/refelt/refelt/RefB.xmi
index 61f447d6..05a00d1b 100644
--- a/refelt/refelt/RefB.xmi
+++ b/refelt/refelt/RefB.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="RefB" pogoRevision="9.6">
-    <description description="Ref (Reference Element) device of type B." title="RefB" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description="Ref (Reference Element) device of type B." title="RefB" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKABaseDevice" sourcePath="../../skabase/SKABaseDevice"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/refelt/RefBchild.xmi b/refelt/refelt/RefBchild.xmi
index 3dfd7e1d..941e2f77 100644
--- a/refelt/refelt/RefBchild.xmi
+++ b/refelt/refelt/RefBchild.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="RefBchild" pogoRevision="9.6">
-    <description description=" Ref (Reference Element) device of type Bchild." title="RefBchild" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description=" Ref (Reference Element) device of type Bchild." title="RefBchild" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKABaseDevice" sourcePath="../../skabase/SKABaseDevice"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/refelt/RefCapabilityA.xmi b/refelt/refelt/RefCapabilityA.xmi
index 7cb16b3a..1c39f18f 100644
--- a/refelt/refelt/RefCapabilityA.xmi
+++ b/refelt/refelt/RefCapabilityA.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="RefCapabilityA" pogoRevision="9.6">
-    <description description="Ref (Reference Element) device of Type Capability A" title="RefCapabilityA" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files,Protected Regions" license="none" copyright="" hasMandatoryProperty="true" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description="Ref (Reference Element) device of Type Capability A" title="RefCapabilityA" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files,Protected Regions" license="none" copyright="" hasMandatoryProperty="true" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKAObsDevice" sourcePath="../../skabase/SKAObsDevice"/>
       <inheritances classname="SKACapability" sourcePath="../../skabase/SKACapability"/>
diff --git a/refelt/refelt/RefMaster.xmi b/refelt/refelt/RefMaster.xmi
index aab27845..8f7f537e 100644
--- a/refelt/refelt/RefMaster.xmi
+++ b/refelt/refelt/RefMaster.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="RefMaster" pogoRevision="9.6">
-    <description description="Ref (Reference Element) device of Type Master" title="RefMaster" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description="Ref (Reference Element) device of Type Master" title="RefMaster" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKAMaster" sourcePath="../../skabase/SKAMaster"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/refelt/RefSubarray.xmi b/refelt/refelt/RefSubarray.xmi
index 5f64d6b2..b9ba0156 100644
--- a/refelt/refelt/RefSubarray.xmi
+++ b/refelt/refelt/RefSubarray.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="RefSubarray" pogoRevision="9.6">
-    <description description="Ref (Reference Element) device of Type Subarray" title="RefSubarray" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description="Ref (Reference Element) device of Type Subarray" title="RefSubarray" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKASubarray" sourcePath="../../skabase/SKASubarray"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/refelt/RefTelState.xmi b/refelt/refelt/RefTelState.xmi
index 744fc919..0c1a39a9 100644
--- a/refelt/refelt/RefTelState.xmi
+++ b/refelt/refelt/RefTelState.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="RefTelState" pogoRevision="9.6">
-    <description description="Ref (Reference Element) device of Type TelState" title="RefTelState" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description="Ref (Reference Element) device of Type TelState" title="RefTelState" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files, Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKATelState" sourcePath="../../skabase/SKATelState"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA"/>
diff --git a/refelt/refelt/Server.xmi b/refelt/refelt/Server.xmi
index 967155f7..e331cad4 100644
--- a/refelt/refelt/Server.xmi
+++ b/refelt/refelt/Server.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="Server" pogoRevision="9.6">
-    <description description="Ref (Reference Elt) Server device" title="Server" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description="Ref (Reference Elt) Server device" title="Server" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKABaseDevice" sourcePath="../../skabase/SKABaseDevice"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/refelt/Switch.xmi b/refelt/refelt/Switch.xmi
index 181555f4..78e61571 100644
--- a/refelt/refelt/Switch.xmi
+++ b/refelt/refelt/Switch.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="Switch" pogoRevision="9.6">
-    <description description="Ref (Reference Elt) Swtich device" title="Switch" sourcePath="/home/tango-cs/src/levpro/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description="Ref (Reference Elt) Swtich device" title="Switch" sourcePath="/home/tango-cs/src/lmc-base-classes/refelt/refelt" language="PythonHL" filestogenerate="XMI   file,Code files" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKABaseDevice" sourcePath="../../skabase/SKABaseDevice"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/refelt/release.py b/refelt/release.py
index cd955f36..a9a65700 100644
--- a/refelt/release.py
+++ b/refelt/release.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# This file is part of the levpro/refelt project
+# This file is part of the lmc-base-classes/refelt project
 #
 #
 #
diff --git a/sandbox/refelt_config_starter.json b/sandbox/refelt_config_starter.json
index 8bcba2a5..c98b147f 100644
--- a/sandbox/refelt_config_starter.json
+++ b/sandbox/refelt_config_starter.json
@@ -1,7 +1,7 @@
 {
     "api_version": "v1",
     "tango_hosts": {
-          "levpro": [
+          "lmc-base-classes": [
               {
                   "startup_level": 1,
                   "server_instances": ["FileLogger/elt", "FileLogger/central"]
diff --git a/setup.py b/setup.py
index 3ae3035e..0ee1cc75 100644
--- a/setup.py
+++ b/setup.py
@@ -8,17 +8,16 @@ from setuptools import setup, find_packages
 needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
 pytest_runner = ['pytest-runner'] if needs_pytest else []
 
-setup(name="levpro",
+setup(name="ska_lmc",
       description="Element Base Classes - Evolutionary Prototype",
-      author="MeerKAT CAM Team",
-      author_email="cam@ska.ac.za",
+      author="SKA Team",
       packages=find_packages(),
       include_package_data=True,
       scripts=["scripts/gen_csv_info.py",
                "scripts/purge_xmi_tree.py",
                "scripts/elt_ctl.py",
                ],
-      url='http://ska.ac.za/',
+      url='https://www.skatelescope.org/',
       classifiers=[
           "Development Status :: 3 - Alpha",
           "Intended Audience :: Developers",
@@ -39,5 +38,5 @@ setup(name="levpro",
           "pytest-cov",
           "pytest-xdist"
       ],
-      keywords="levpro lmc ska",
+      keywords="lmc base classes ska",
       zip_safe=False)
diff --git a/skabase/SKAAlarmHandler/SKAAlarmHandler.xmi b/skabase/SKAAlarmHandler/SKAAlarmHandler.xmi
index e2550081..d8ca2c31 100644
--- a/skabase/SKAAlarmHandler/SKAAlarmHandler.xmi
+++ b/skabase/SKAAlarmHandler/SKAAlarmHandler.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="SKAAlarmHandler" pogoRevision="9.6">
-    <description description="A generic base device for Alarms for SKA." title="SKAAlarmHandler" sourcePath="/home/pogo/src/levpro/skabase/SKAAlarmHandler" language="PythonHL" filestogenerate="XMI   file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description="A generic base device for Alarms for SKA." title="SKAAlarmHandler" sourcePath="/home/pogo/src/lmc-base-classes/skabase/SKAAlarmHandler" language="PythonHL" filestogenerate="XMI   file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKABaseDevice" sourcePath="../SKABaseDevice"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAAlarmHandler"/>
diff --git a/skabase/SKABaseDevice/SKABaseDevice.xmi b/skabase/SKABaseDevice/SKABaseDevice.xmi
index 85e68d5b..185f8571 100644
--- a/skabase/SKABaseDevice/SKABaseDevice.xmi
+++ b/skabase/SKABaseDevice/SKABaseDevice.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="SKABaseDevice" pogoRevision="9.6">
-    <description description="A generic base device for SKA." title="SKABASE" sourcePath="/home/pogo/src/levpro/skabase/SKABaseDevice" language="PythonHL" filestogenerate="XMI   file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description="A generic base device for SKA." title="SKABASE" sourcePath="/home/pogo/src/lmc-base-classes/skabase/SKABaseDevice" language="PythonHL" filestogenerate="XMI   file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKABaseDevice"/>
     </description>
diff --git a/skabase/SKACapability/SKACapability.xmi b/skabase/SKACapability/SKACapability.xmi
index 6698d812..196ff840 100644
--- a/skabase/SKACapability/SKACapability.xmi
+++ b/skabase/SKACapability/SKACapability.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="SKACapability" pogoRevision="9.6">
-    <description description="Subarray handling device" title="SKACapability" sourcePath="/home/pogo/src/levpro/skabase/SKACapability" language="PythonHL" filestogenerate="XMI   file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="true" hasAbstractAttribute="false">
+    <description description="Subarray handling device" title="SKACapability" sourcePath="/home/pogo/src/lmc-base-classes/skabase/SKACapability" language="PythonHL" filestogenerate="XMI   file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="true" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKAObsDevice" sourcePath="../SKAObsDevice"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="SkaBase" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="none" reference=""/>
diff --git a/skabase/SKALogger/SKALogger.xmi b/skabase/SKALogger/SKALogger.xmi
index 92a73f91..58a35957 100644
--- a/skabase/SKALogger/SKALogger.xmi
+++ b/skabase/SKALogger/SKALogger.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="SKALogger" pogoRevision="9.6">
-    <description description="A generic base device for Logging for SKA." title="SKALogger" sourcePath="/home/pogo/src/levpro/skabase/SKALogger" language="PythonHL" filestogenerate="XMI   file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description="A generic base device for Logging for SKA." title="SKALogger" sourcePath="/home/pogo/src/lmc-base-classes/skabase/SKALogger" language="PythonHL" filestogenerate="XMI   file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKABaseDevice" sourcePath="../SKABaseDevice"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKALogger"/>
diff --git a/skabase/SKAMaster/SKAMaster.xmi b/skabase/SKAMaster/SKAMaster.xmi
index 50f95bef..f14469c8 100644
--- a/skabase/SKAMaster/SKAMaster.xmi
+++ b/skabase/SKAMaster/SKAMaster.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="SKAMaster" pogoRevision="9.6">
-    <description description="A master test" title="SKAMaster" sourcePath="/home/pogo/src/levpro/skabase/SKAMaster" language="PythonHL" filestogenerate="XMI   file,Code files,Python Package,Protected Regions" license="none" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description="A master test" title="SKAMaster" sourcePath="/home/pogo/src/lmc-base-classes/skabase/SKAMaster" language="PythonHL" filestogenerate="XMI   file,Code files,Python Package,Protected Regions" license="none" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKABaseDevice" sourcePath="../SKABaseDevice"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="SkaBase" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="none" reference=""/>
diff --git a/skabase/SKAObsDevice/SKAObsDevice.xmi b/skabase/SKAObsDevice/SKAObsDevice.xmi
index 37085f06..1427ce11 100644
--- a/skabase/SKAObsDevice/SKAObsDevice.xmi
+++ b/skabase/SKAObsDevice/SKAObsDevice.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="SKAObsDevice" pogoRevision="9.6">
-    <description description="A generic base device for Observations for SKA." title="SKAObsDevice" sourcePath="/home/pogo/src/levpro/skabase/SKAObsDevice" language="PythonHL" filestogenerate="XMI   file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="true" hasAbstractAttribute="false">
+    <description description="A generic base device for Observations for SKA." title="SKAObsDevice" sourcePath="/home/pogo/src/lmc-base-classes/skabase/SKAObsDevice" language="PythonHL" filestogenerate="XMI   file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="true" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKABaseDevice" sourcePath="../SKABaseDevice"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKAObsDevice"/>
diff --git a/skabase/SKASubarray/SKASubarray.xmi b/skabase/SKASubarray/SKASubarray.xmi
index af928c78..1acfc0da 100644
--- a/skabase/SKASubarray/SKASubarray.xmi
+++ b/skabase/SKASubarray/SKASubarray.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="SKASubarray" pogoRevision="9.6">
-    <description description="SubArray handling device" title="SKASubarray" sourcePath="/home/pogo/src/levpro/skabase/SKASubarray" language="PythonHL" filestogenerate="XMI   file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description="SubArray handling device" title="SKASubarray" sourcePath="/home/pogo/src/lmc-base-classes/skabase/SKASubarray" language="PythonHL" filestogenerate="XMI   file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKAObsDevice" sourcePath="../SKAObsDevice"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="SkaBase" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="none" reference=""/>
diff --git a/skabase/SKATelState/SKATelState.xmi b/skabase/SKATelState/SKATelState.xmi
index bf213de2..8c49ebf2 100644
--- a/skabase/SKATelState/SKATelState.xmi
+++ b/skabase/SKATelState/SKATelState.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="SKATelState" pogoRevision="9.6">
-    <description description="A generic base device for Telescope State for SKA." title="SKATelState" sourcePath="/home/pogo/src/levpro/skabase/SKATelState" language="PythonHL" filestogenerate="XMI   file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description="A generic base device for Telescope State for SKA." title="SKATelState" sourcePath="/home/pogo/src/lmc-base-classes/skabase/SKATelState" language="PythonHL" filestogenerate="XMI   file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="true" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKABaseDevice" sourcePath="../SKABaseDevice"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKATelState"/>
diff --git a/skabase/SKATestDevice/SKATestDevice.xmi b/skabase/SKATestDevice/SKATestDevice.xmi
index 7e55f83f..9fa7055e 100644
--- a/skabase/SKATestDevice/SKATestDevice.xmi
+++ b/skabase/SKATestDevice/SKATestDevice.xmi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
 <pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
   <classes name="SKATestDevice" pogoRevision="9.6">
-    <description description="A generic Test device for testing SKA base class functionalites." title="SKATestDevice" sourcePath="/home/pogo/src/levpro/skabase/SKATestDevice" language="PythonHL" filestogenerate="XMI   file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
+    <description description="A generic Test device for testing SKA base class functionalites." title="SKATestDevice" sourcePath="/home/pogo/src/lmc-base-classes/skabase/SKATestDevice" language="PythonHL" filestogenerate="XMI   file,Code files,Python Package,Protected Regions" license="none" copyright="" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
       <inheritances classname="Device_Impl" sourcePath=""/>
       <inheritances classname="SKABaseDevice" sourcePath="../SKABaseDevice"/>
       <identification contact="at ska.ac.za - cam" author="cam" emailDomain="ska.ac.za" classFamily="OtherInstruments" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="SKASA" reference="SKA-SKATestDevice"/>
-- 
GitLab