diff --git a/README.md b/README.md
index b3ebcfd7e3daa607e05cfb206b213389a5996b9a..930aca8df492cbec712195b16b4e43b29da73ae5 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Waraps Developer Environment
 
-Here we document how to use the waraps ROS development environment. We
+Here we document how to use the LRS ROS development environment. We
 also provide some useful scripts.
 
 The basic idea is that the developer has his own Linux Ubuntu ROS
@@ -14,7 +14,7 @@ And then do the relevant things below.
 
 If you have a ROS machine already follow the following instructions:
 
-- [Login Docker Registry](https://gitlab.liu.se/lrs/waraps_docker_images) Do not download the image.
+- [Login Docker Registry](https://gitlab.liu.se/lrs/devenv_docker_images) Do not download the image.
 - [Prepare Existing ROS Computer](doc/prepare_ros_computer.md)
 - [Local ROS Installation and LRS Docker Modules](doc/local_ros_installation.md)
 
@@ -23,10 +23,10 @@ The above links gave information how to setup and test basic functionality.
 For more information how to integrate your code we have split the
 informaion in different sub areas:
 
-- [Waraps Gransol](https://gitlab.liu.se/lrs/waraps_granso) : Sensor simulation in Granso doe DJI, MQTT interface alsoe to images
-- [Waraps Control](https://gitlab.liu.se/lrs/waraps_control)
-- [Waraps Motion Planning](https://gitlab.liu.se/lrs/waraps_motion_planning)
-- [Waraps Task Planning](https://gitlab.liu.se/lrs/waraps_task_planning)
+- [LRS Gransol](https://gitlab.liu.se/lrs/lrs_devenv_granso) : Sensor simulation in Granso doe DJI, MQTT interface also to images
+- [LRS Control](https://gitlab.liu.se/lrs/lrs_devenv_control)
+- [LRS Motion Planning](https://gitlab.liu.se/lrs/lrs_devenv_motion_planning)
+- [LRS Task Planning](https://gitlab.liu.se/lrs/lrs_devenv_task_planning)
 
 
 
diff --git a/doc/local_ros_installation.md b/doc/local_ros_installation.md
index f3cfab546e0e7bc802edbe03acf0573a0bf9e4c8..b2d9f078195aa1f90bf44a8eee9459e11d3ed70f 100644
--- a/doc/local_ros_installation.md
+++ b/doc/local_ros_installation.md
@@ -21,20 +21,20 @@ for en overview of the available functionality.
 
 ## Preparation
 
-Get the waraps repo:
+Get the lrs_devenv_common repo:
 ```bash
-git clone git@gitlab.liu.se:lrs/waraps.git
+git clone git@gitlab.liu.se:lrs/lrs_devenv_common.git
 ```
 or if you need to specify the key:
 ```bash
 GIT_SSH_COMMAND='ssh -i ~/.ssh/wara_deploy -o IdentitiesOnly=yes' git clone git@gitlab.liu.se:lrs/waraps.git
 ```
 
-Put the script directory of the waraps repo in your PATH plus add
+Put the script directory of the lrs_devenv_common repo in your PATH plus add
 some variables that are needed. For example in .bashrc:
 
 ```bash
-export PATH="...../waraps/script:$PATH"
+export PATH="...../lrs_devenv_common/script:$PATH"
 
 export WORLD_ORIGIN_LAT=57.7605573519 
 export WORLD_ORIGIN_LON=16.6827607783
@@ -64,12 +64,12 @@ Execute commands in a running docker container.
 ```bash
 #!/bin/bash
 
-docker exec -it waradevel "$@"
+docker exec -it lrsdevel "$@"
 ```
 
 ### wgrun
 
-Start a docker container named waradevel and run the commands there. Use this if you have NVIDIA graphics.
+Start a docker container named lrsdevel and run the commands there. Use this if you have NVIDIA graphics.
 ```bash
 #!/bin/bash
 
@@ -83,7 +83,7 @@ docker run --gpus all \
   -v /tmp:/exttmp \
   -e DISPLAY=unix${DISPLAY}\
   -e ROS_HOSTNAME=localhost \
-  --rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-melodic:devel "$@"
+  --rm -it --name lrsdevel gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-melodic:devel "$@"
 fi
 
 if [[ $(lsb_release -rs) == "20.04" ]]; then
@@ -96,14 +96,14 @@ docker run --gpus all \
   -v /tmp:/exttmp \
   -e DISPLAY=unix${DISPLAY}\
   -e ROS_HOSTNAME=localhost \
-  --rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-noetic:devel "$@"
+  --rm -it --name lrsdevel gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-noetic:devel "$@"
 fi
 ```
 
 
 ### wrun
 
-Start a docker container named waradevel and run the command there. Use if you do not have NVIDIA graphics.
+Start a docker container named lrsdevel and run the command there. Use if you do not have NVIDIA graphics.
 ```bash
 #!/bin/bash
 
@@ -116,7 +116,7 @@ docker run \
   -v /tmp:/exttmp \
   -e DISPLAY=unix${DISPLAY}\
   -e ROS_HOSTNAME=localhost \
-  --rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-melodic:devel "$@"
+  --rm -it --name lrsdevel gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-melodic:devel "$@"
 fi
 
 if [[ $(lsb_release -rs) == "20.04" ]]; then
@@ -128,7 +128,7 @@ docker run \
   -v /tmp:/exttmp \
   -e DISPLAY=unix${DISPLAY}\
   -e ROS_HOSTNAME=localhost \
-  --rm -it --name waradevel gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-noetic:devel "$@"
+  --rm -it --name lrsdevel gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-noetic:devel "$@"
 fi
 ```
 
@@ -140,13 +140,13 @@ Pull the image.
 #!/bin/bash
 
 if [[ $(lsb_release -rs) == "18.04" ]]; then
-    echo "Pulling gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-melodic:devel"
-    docker pull gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-melodic:devel
+    echo "Pulling gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-melodic:devel"
+    docker pull gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-melodic:devel
 fi
 
 if [[ $(lsb_release -rs) == "20.04" ]]; then
-    echo "Pulling gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-noetic:devel"
-    docker pull gitlab.liu.se:5000/lrs/waraps_docker_images/waraps-noetic:devel
+    echo "Pulling gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-noetic:devel"
+    docker pull gitlab.liu.se:5000/lrs/devenv_docker_images/lrs-noetic:devel
 fi
 ```