diff --git a/.gitignore b/.gitignore
index c4ec678..dcd752d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,9 +46,9 @@ venv/
 ENV/
 env.bak/
 venv.bak/
-.spyderproject
-.spyproject
-.ropeproject
+.spyderDXFMAKRO
+.spyDXFMAKRO
+.ropeDXFMAKRO
 .mypy_cache/
 .dmypy.json
 dmypy.json
diff --git a/README.md b/README.md
index 25d9b57..019684f 100644
--- a/README.md
+++ b/README.md
@@ -29,15 +29,15 @@ test/
 
 | Variable       | Beschreibung              |
 |----------------|---------------------------|
-| `PROJECT`      | Wurzelverzeichnis          |
-| `PV_BIN`       | Skriptverzeichnis          |
-| `PV_LIB`       | Python-Quellcode           |
-| `PV_CFG`       | Konfigurationsdateien      |
-| `PV_DATA`      | Eingabedaten               |
-| `PV_LOG`       | Log-Dateien                |
-| `PV_RESULTS`   | Ergebnisse                 |
-| `PV_EXAMPLES`  | Beispieldateien            |
-| `PYTHONPATH`   | Erweitert um `PV_LIB`      |
+| `DXFMAKRO`      | Wurzelverzeichnis          |
+| `DXFM_BIN`       | Skriptverzeichnis          |
+| `DXFM_LIB`       | Python-Quellcode           |
+| `DXFM_CFG`       | Konfigurationsdateien      |
+| `DXFM_DATA`      | Eingabedaten               |
+| `DXFM_LOG`       | Log-Dateien                |
+| `DXFM_RESULTS`   | Ergebnisse                 |
+| `DXFM_EXAMPLES`  | Beispieldateien            |
+| `PYTHONPATH`   | Erweitert um `DXFM_LIB`      |
 
 ## Installation
 
diff --git a/bin/activate_venv.bat b/bin/activate_venv.bat
index 3f3ba13..ad4f82f 100644
--- a/bin/activate_venv.bat
+++ b/bin/activate_venv.bat
@@ -5,13 +5,13 @@ REM ================================================================
 
 call "%~dp0setenv.bat"
 
-if not exist "%PROJECT%\.venv" (
+if not exist "%DXFMAKRO%\.venv" (
     echo FEHLER: Virtual environment nicht gefunden.
     echo Bitte zuerst bin\install_py.bat ausfuehren.
     exit /b 1
 )
 
-call "%PROJECT%\.venv\Scripts\activate.bat"
+call "%DXFMAKRO%\.venv\Scripts\activate.bat"
 echo Virtuelle Umgebung aktiviert.
 echo Python-Version:
 python --version
diff --git a/bin/activate_venv.sh b/bin/activate_venv.sh
index f02afdd..f4ad880 100644
--- a/bin/activate_venv.sh
+++ b/bin/activate_venv.sh
@@ -8,13 +8,13 @@
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/setenv.sh"
 
-if [ ! -d "$PROJECT/.venv" ]; then
+if [ ! -d "$DXFMAKRO/.venv" ]; then
     echo "FEHLER: Virtual environment nicht gefunden."
     echo "Bitte zuerst bin/install_py.sh ausfuehren."
     return 1
 fi
 
-source "$PROJECT/.venv/bin/activate"
+source "$DXFMAKRO/.venv/bin/activate"
 echo "Virtuelle Umgebung aktiviert."
 echo "Python-Version:"
 python --version
diff --git a/bin/get_cmd.bat b/bin/get_cmd.bat
index 4f49895..57bd79e 100644
--- a/bin/get_cmd.bat
+++ b/bin/get_cmd.bat
@@ -4,4 +4,4 @@ REM TEST - Shell mit gesetzten Umgebungsvariablen oeffnen
 REM ================================================================
 
 call "%~dp0setenv.bat"
-start cmd /k "echo TEST Umgebung aktiv. && echo PROJECT=%PROJECT%"
+start cmd /k "echo TEST Umgebung aktiv. && echo DXFMAKRO=%DXFMAKRO%"
diff --git a/bin/install_py.bat b/bin/install_py.bat
index 522db7b..2bc3bfd 100644
--- a/bin/install_py.bat
+++ b/bin/install_py.bat
@@ -5,14 +5,14 @@ REM ================================================================
 
 call "%~dp0setenv.bat"
 
-if not exist "%PROJECT%\.venv" (
+if not exist "%DXFMAKRO%\.venv" (
     echo Initialisiere Python virtual environment...
-    py -m venv "%PROJECT%\.venv" --upgrade-deps
+    py -m venv "%DXFMAKRO%\.venv" --upgrade-deps
     echo Erfolgreich.
 
-    call "%PROJECT%\.venv\Scripts\activate.bat"
+    call "%DXFMAKRO%\.venv\Scripts\activate.bat"
     echo Installiere erforderliche Python Packages...
-    pip install -r "%PROJECT%\requirements.txt" -q
+    pip install -r "%DXFMAKRO%\requirements.txt" -q
     echo Erfolgreich.
     deactivate
 ) else (
diff --git a/bin/install_py.sh b/bin/install_py.sh
index c8f1903..07e55ef 100644
--- a/bin/install_py.sh
+++ b/bin/install_py.sh
@@ -6,14 +6,14 @@
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/setenv.sh"
 
-if [ ! -d "$PROJECT/.venv" ]; then
+if [ ! -d "$DXFMAKRO/.venv" ]; then
     echo "Initialisiere Python virtual environment..."
-    python3 -m venv "$PROJECT/.venv" --upgrade-deps
+    python3 -m venv "$DXFMAKRO/.venv" --upgrade-deps
     echo "Erfolgreich."
 
-    source "$PROJECT/.venv/bin/activate"
+    source "$DXFMAKRO/.venv/bin/activate"
     echo "Installiere erforderliche Python Packages..."
-    pip install -r "$PROJECT/requirements.txt" -q
+    pip install -r "$DXFMAKRO/requirements.txt" -q
     echo "Erfolgreich."
     deactivate
 else
diff --git a/bin/setenv.bat b/bin/setenv.bat
index 4887209..89f78ef 100644
--- a/bin/setenv.bat
+++ b/bin/setenv.bat
@@ -7,44 +7,44 @@ REM ================================================================
 echo Setting up environment variables for TEST ...
 
 REM Basis-Projektpfad (aktueller Ordner)
-set "PROJECT=%~dp0.."
-if "%PROJECT:~-6%"=="bin\.." set "PROJECT=%PROJECT:~0,-6%"
-if "%PROJECT:~-1%"=="\" set "PROJECT=%PROJECT:~0,-1%"
+set "DXFMAKRO=%~dp0.."
+if "%DXFMAKRO:~-6%"=="bin\.." set "DXFMAKRO=%DXFMAKRO:~0,-6%"
+if "%DXFMAKRO:~-1%"=="\" set "DXFMAKRO=%DXFMAKRO:~0,-1%"
 
 REM Pfade fuer verschiedene Komponenten
-set "PV_BIN=%PROJECT%\bin"
-set "PV_LIB=%PROJECT%\lib"
-set "PV_DATA=%PROJECT%\data"
-set "PV_CFG=%PROJECT%\cfg"
-set "PV_BLOCKS=%PROJECT%\Blocks"
-set "PV_LISP=%PROJECT%\Lisp"
+set "DXFM_BIN=%DXFMAKRO%\bin"
+set "DXFM_LIB=%DXFMAKRO%\lib"
+set "DXFM_DATA=%DXFMAKRO%\data"
+set "DXFM_CFG=%DXFMAKRO%\cfg"
+set "DXFM_BLOCKS=%DXFMAKRO%\Blocks"
+set "DXFM_LISP=%DXFMAKRO%\Lisp"
 
 REM Python-Pfad erweitern (nur wenn noch nicht vorhanden)
-echo %PYTHONPATH% | find /i "%PV_LIB%" >nul
+echo %PYTHONPATH% | find /i "%DXFM_LIB%" >nul
 if errorlevel 1 (
-    set "PYTHONPATH=%PV_LIB%;%PYTHONPATH%"
+    set "PYTHONPATH=%DXFM_LIB%;%PYTHONPATH%"
 )
 
 REM Ordner erstellen falls sie nicht existieren
-if not exist "%PV_BIN%" mkdir "%PV_BIN%"
-if not exist "%PV_CFG%" mkdir "%PV_CFG%"
-if not exist "%PV_LIB%" mkdir "%PV_LIB%"
-if not exist "%PV_DATA%" mkdir "%PV_DATA%"
-if not exist "%PV_BLOCKS%" mkdir "%PV_BLOCKS%"
-if not exist "%PV_LISP%" mkdir "%PV_LISP%"
+if not exist "%DXFM_BIN%" mkdir "%DXFM_BIN%"
+if not exist "%DXFM_CFG%" mkdir "%DXFM_CFG%"
+if not exist "%DXFM_LIB%" mkdir "%DXFM_LIB%"
+if not exist "%DXFM_DATA%" mkdir "%DXFM_DATA%"
+if not exist "%DXFM_BLOCKS%" mkdir "%DXFM_BLOCKS%"
+if not exist "%DXFM_LISP%" mkdir "%DXFM_LISP%"
 
 REM Umgebungsvariablen anzeigen
 echo.
 echo ================================================================
 echo TEST ENVIRONMENT SETUP COMPLETE
 echo ================================================================
-echo PROJECT         = %PROJECT%
-echo PV_BIN          = %PV_BIN%
-echo PV_CFG          = %PV_CFG%
-echo PV_LIB          = %PV_LIB%
-echo PV_DATA         = %PV_DATA%
-echo PV_BLOCKS       = %PV_BLOCKS%
-echo PV_LISP         = %PV_LISP%
+echo DXFMAKRO         = %DXFMAKRO%
+echo DXFM_BIN          = %DXFM_BIN%
+echo DXFM_CFG          = %DXFM_CFG%
+echo DXFM_LIB          = %DXFM_LIB%
+echo DXFM_DATA         = %DXFM_DATA%
+echo DXFM_BLOCKS       = %DXFM_BLOCKS%
+echo DXFM_LISP         = %DXFM_LISP%
 echo PYTHONPATH      = %PYTHONPATH%
 echo ================================================================
 echo.
diff --git a/bin/setenv.sh b/bin/setenv.sh
index e92adaf..f1c5a92 100644
--- a/bin/setenv.sh
+++ b/bin/setenv.sh
@@ -9,38 +9,38 @@ echo "Setting up environment variables for TEST ..."
 
 # Basis-Projektpfad (uebergeordnetes Verzeichnis von bin/)
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-export PROJECT="$(cd "$SCRIPT_DIR/.." && pwd)"
+export DXFMAKRO="$(cd "$SCRIPT_DIR/.." && pwd)"
 
 # Pfade fuer verschiedene Komponenten
-export PV_BIN="$PROJECT/bin"
-export PV_LIB="$PROJECT/lib"
-export PV_DATA="$PROJECT/data"
-export PV_CFG="$PROJECT/cfg"
-export PV_LOG="$PROJECT/log"
-export PV_TESTS="$PROJECT/tests"
-export PV_RESULTS="$PROJECT/results"
-export PV_EXAMPLES="$PROJECT/examples"
+export DXFM_BIN="$DXFMAKRO/bin"
+export DXFM_LIB="$DXFMAKRO/lib"
+export DXFM_DATA="$DXFMAKRO/data"
+export DXFM_CFG="$DXFMAKRO/cfg"
+export DXFM_LOG="$DXFMAKRO/log"
+export DXFM_TESTS="$DXFMAKRO/tests"
+export DXFM_RESULTS="$DXFMAKRO/results"
+export DXFM_EXAMPLES="$DXFMAKRO/examples"
 
 # Python-Pfad erweitern (nur wenn noch nicht vorhanden)
-if [[ ":$PYTHONPATH:" != *":$PV_LIB:"* ]]; then
-    export PYTHONPATH="$PV_LIB:$PYTHONPATH"
+if [[ ":$PYTHONPATH:" != *":$DXFM_LIB:"* ]]; then
+    export PYTHONPATH="$DXFM_LIB:$PYTHONPATH"
 fi
 
 # Ordner erstellen falls sie nicht existieren
-mkdir -p "$PV_BIN" "$PV_CFG" "$PV_LIB" "$PV_DATA" "$PV_LOG" "$PV_RESULTS" "$PV_EXAMPLES"
+mkdir -p "$DXFM_BIN" "$DXFM_CFG" "$DXFM_LIB" "$DXFM_DATA" "$DXFM_LOG" "$DXFM_RESULTS" "$DXFM_EXAMPLES"
 
 echo ""
 echo "================================================================"
 echo "TEST ENVIRONMENT SETUP COMPLETE"
 echo "================================================================"
-echo "PROJECT         = $PROJECT"
-echo "PV_BIN          = $PV_BIN"
-echo "PV_CFG          = $PV_CFG"
-echo "PV_LIB          = $PV_LIB"
-echo "PV_DATA         = $PV_DATA"
-echo "PV_RESULTS      = $PV_RESULTS"
-echo "PV_LOG          = $PV_LOG"
-echo "PV_EXAMPLES     = $PV_EXAMPLES"
+echo "DXFMAKRO         = $DXFMAKRO"
+echo "DXFM_BIN          = $DXFM_BIN"
+echo "DXFM_CFG          = $DXFM_CFG"
+echo "DXFM_LIB          = $DXFM_LIB"
+echo "DXFM_DATA         = $DXFM_DATA"
+echo "DXFM_RESULTS      = $DXFM_RESULTS"
+echo "DXFM_LOG          = $DXFM_LOG"
+echo "DXFM_EXAMPLES     = $DXFM_EXAMPLES"
 echo "PYTHONPATH      = $PYTHONPATH"
 echo "================================================================"
 echo ""