diff --git a/README.md b/README.md
index 07ec32e495..31c08db348 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Using x86_64/intel/broadwell subdirectory for software layer
 Initializing Lmod...
 Prepending /cvmfs/pilot.nessi.no/versions/2023.06/software/x86_64/intel/broadwell/modules/all to $MODULEPATH...
 Environment set up to use EESSI (2023.06), have fun!
-[EESSI pilot 2023.06] $
+[EESSI 2023.06] $
 ```
 
 ### Accessing EESSI via a container
diff --git a/init/Magic_Castle/bash b/init/Magic_Castle/bash
index 896a6b1810..fdeda20e3b 100644
--- a/init/Magic_Castle/bash
+++ b/init/Magic_Castle/bash
@@ -36,4 +36,4 @@ else
    module reload
 fi
 
-echo "Environment set up to use EESSI pilot software stack (${EESSI_VERSION}), have fun!"
+echo "Environment set up to use EESSI (${EESSI_VERSION}), have fun!"
diff --git a/init/Magic_Castle/eessi_python3 b/init/Magic_Castle/eessi_python3
index 8fd37e9c87..b2f7fd4d66 100755
--- a/init/Magic_Castle/eessi_python3
+++ b/init/Magic_Castle/eessi_python3
@@ -16,6 +16,6 @@ eessi_python=$(ls ${EESSI_SOFTWARE_PATH}/software/Python/3*GCCcore*/bin/python |
 if [ -f "$eessi_python" ]; then
   $eessi_python "$@"
 else
-  echo "ERROR: No EESSI python 3 available."
+  echo "ERROR: No EESSI Python 3 available."
   false
 fi
diff --git a/init/bash b/init/bash
index ae2ff40526..13bd9ffad8 100644
--- a/init/bash
+++ b/init/bash
@@ -13,7 +13,7 @@ source $(dirname "$BASH_SOURCE")/eessi_environment_variables
 # only continue if setting EESSI environment variables worked fine
 if [ $? -eq 0 ]; then
 
-    export PS1="[EESSI $EESSI_PILOT_VERSION] $ "
+    export PS1="[EESSI $EESSI_VERSION] $ "
 
     # add location of commands provided by compat layer to $PATH;
     # see https://github.com/EESSI/software-layer/issues/52