diff --git a/compile.bat b/compile.bat
index 1491b51..48c6e1a 100644
--- a/compile.bat
+++ b/compile.bat
@@ -2,8 +2,8 @@
 setlocal
 
 @REM SET BASE_IMG=git.1159.cl/mario1159/analog-xk-web:latest
-SET BASE_IMG=git.1159.cl/mario1159/analog-xk-desktop:latest
-SET RESULT_IMAGE=akilesalreadytaken/analog-tools:latest
+SET BASE_IMG=git.1159.cl/mario1159/heavy-desktop:latest
+SET RESULT_IMAGE=akilesalreadytaken/chipathon-tools:latest
 
 SET CALL=call
 :parse
@@ -24,7 +24,7 @@ SET CALL=call
 
 
 :run
-    %CALL% docker build --build-arg BASE_IMG=%BASE_IMG% -t %RESULT_IMAGE% -f stacks/analog-tools/Dockerfile stacks/analog-tools/
+    %CALL% docker build --build-arg BASE_IMG=%BASE_IMG% -t %RESULT_IMAGE% -f stacks/chipathon-tools/Dockerfile stacks/chipathon-tools/
     GOTO end
 
 :end
diff --git a/run.bat b/run.bat
index db1b222..423e04d 100644
--- a/run.bat
+++ b/run.bat
@@ -2,7 +2,7 @@
 setlocal
 
 SET IMAGE=akilesalreadytaken/analog-xk:latest
-SET IMAGE=akilesalreadytaken/analog-tools:latest
+SET IMAGE=akilesalreadytaken/chipathon-tools:latest
 ::SET IMAGE=git.1159.cl/mario1159/analog-xk-web:latest
 
 SET CALL=call
@@ -51,7 +51,7 @@ SET CALL=call
     IF NOT DEFINED CONTAINER_USER  SET CONTAINER_USER=1000
     IF NOT DEFINED CONTAINER_GROUP SET CONTAINER_GROUP=1000
 
-    IF NOT DEFINED CONTAINER_NAME  SET CONTAINER_NAME=analog-tools
+    IF NOT DEFINED CONTAINER_NAME  SET CONTAINER_NAME=chipathon-tools
 
     IF NOT DEFINED JUPYTER_PORT    SET JUPYTER_PORT=8888
     IF NOT DEFINED VNC_PORT        SET VNC_PORT=8444
diff --git a/run.sh b/run.sh
index 7d65979..5ab132e 100644
--- a/run.sh
+++ b/run.sh
@@ -2,7 +2,7 @@
 set -e
 
 # IMAGE=akilesalreadytaken/analog-xk:latest
-IMAGE=akilesalreadytaken/analog-tools:latest
+IMAGE=akilesalreadytaken/chipathon-tools:latest
 # IMAGE=git.1159.cl/mario1159/analog-xk-web:latest
 
 CALL=
@@ -48,7 +48,7 @@ function run () {
     [ -z "${CONTAINER_USER+x}" ]  && CONTAINER_USER=$(id -u)
     [ -z "${CONTAINER_GROUP+x}" ] && CONTAINER_GROUP=$(id -g)
 
-    [ -z "${CONTAINER_NAME+x}" ]  && CONTAINER_NAME=analog-tools
+    [ -z "${CONTAINER_NAME+x}" ]  && CONTAINER_NAME=chipathon-tools
 
     [ -z "${JUPYTER_PORT+x}" ]    && JUPYTER_PORT=8888
     [ -z "${VNC_PORT+x}" ]        && VNC_PORT=8444
diff --git a/stacks/analog-tools/Dockerfile b/stacks/chipathon-tools/Dockerfile
similarity index 82%
rename from stacks/analog-tools/Dockerfile
rename to stacks/chipathon-tools/Dockerfile
index 28a1003..8b44771 100644
--- a/stacks/analog-tools/Dockerfile
+++ b/stacks/chipathon-tools/Dockerfile
@@ -1,5 +1,5 @@
-ARG BASE_IMG=analog-xk
-FROM $BASE_IMG as analog-tools
+ARG BASE_IMG=heavy-desktop
+FROM $BASE_IMG as chipathon-tools
 
 # Add scripts
 COPY --chown=designer:designer --chmod=755 scripts/install-open-pdks.sh .
diff --git a/stacks/analog-tools/scripts/.bashrc b/stacks/chipathon-tools/scripts/.bashrc
similarity index 100%
rename from stacks/analog-tools/scripts/.bashrc
rename to stacks/chipathon-tools/scripts/.bashrc
diff --git a/stacks/analog-tools/scripts/.vimrc b/stacks/chipathon-tools/scripts/.vimrc
similarity index 100%
rename from stacks/analog-tools/scripts/.vimrc
rename to stacks/chipathon-tools/scripts/.vimrc
diff --git a/stacks/analog-tools/scripts/iic-spice-model-red.py b/stacks/chipathon-tools/scripts/iic-spice-model-red.py
similarity index 100%
rename from stacks/analog-tools/scripts/iic-spice-model-red.py
rename to stacks/chipathon-tools/scripts/iic-spice-model-red.py
diff --git a/stacks/analog-tools/scripts/install-open-pdks.sh b/stacks/chipathon-tools/scripts/install-open-pdks.sh
similarity index 100%
rename from stacks/analog-tools/scripts/install-open-pdks.sh
rename to stacks/chipathon-tools/scripts/install-open-pdks.sh
diff --git a/stacks/analog-tools/scripts/patch-open-pdks.sh b/stacks/chipathon-tools/scripts/patch-open-pdks.sh
similarity index 99%
rename from stacks/analog-tools/scripts/patch-open-pdks.sh
rename to stacks/chipathon-tools/scripts/patch-open-pdks.sh
index f1c7311..864b99e 100644
--- a/stacks/analog-tools/scripts/patch-open-pdks.sh
+++ b/stacks/chipathon-tools/scripts/patch-open-pdks.sh
@@ -11,6 +11,7 @@ PRECHECK_REPO=https://raw.githubusercontent.com/efabless/mpw_precheck/main/check
 PRECHECK_GF_FILE=gf180mcuC_mr.drc
 PRECHECK_SKY_FILE=sky130A_mr.drc
 
+# TODO: DOWNLOAD WITH WGET, DONT HAVE IT STATIC
 if [ -d $SCRIPT_DIR/iic-spice-model-red.py ]; then
     echo File iic-spice-model.red.py not found
     return -1