diff --git a/examples/PoolBox/Makefile b/examples/PoolBox/Makefile
index 00f7faab..0c35c831 100644
--- a/examples/PoolBox/Makefile
+++ b/examples/PoolBox/Makefile
@@ -10,27 +10,27 @@ endif
 # Add regions on your own
 # Extend them with what you need
 ifeq ($(REGION),SCEE)
-    export TV_FORMAT=PAL
-    export LICENSE=LICENSEE
-    export BOOT_FILE=SLES_000.25
+    export PSX_TV_FORMAT=PAL
+    export PSX_LICENSE=LICENSEE
+    export PSX_BOOT_FILE=SLES_000.25
 endif
 ifeq ($(REGION),SCEA)
-    export TV_FORMAT=NTSC
-    export LICENSE=LICENSEA
-    export BOOT_FILE=SLUS_001.51
+    export PSX_TV_FORMAT=NTSC
+    export PSX_LICENSE=LICENSEA
+    export PSX_BOOT_FILE=SLUS_001.51
 endif
 ifeq ($(REGION),SCEI)
-    export TV_FORMAT=NTSC
-    export LICENSE=LICENSEJ
-    export BOOT_FILE=XXXX_AAA.AA
+    export PSX_TV_FORMAT=NTSC
+    export PSX_LICENSE=LICENSEJ
+    export PSX_BOOT_FILE=XXXX_AAA.AA
 endif
 
-ifndef TV_FORMAT
-$(error TV_FORMAT has not be set! REGION not specified?)
+ifndef PSX_TV_FORMAT
+$(error PSX_TV_FORMAT has not be set! REGION not specified?)
 endif
 
-ifndef LICENSE
-$(error LICENSE has not be set! REGION not specified?)
+ifndef PSX_LICENSE
+$(error PSX_LICENSE has not be set! REGION not specified?)
 endif
 
 all clean rebuild: |assets_$(MAKECMDGOALS) application_$(MAKECMDGOALS) cd_$(MAKECMDGOALS)  
diff --git a/examples/PoolBox/iso/Config.xml b/examples/PoolBox/iso/Config.xml
index 05197cf7..0de12301 100644
--- a/examples/PoolBox/iso/Config.xml
+++ b/examples/PoolBox/iso/Config.xml
@@ -1,17 +1,16 @@
 <ISO_Project>
     <Description>
         <Publisher>Jaby</Publisher>
-        <License>%PSX_LICENSE_PATH%/%LICENSE%.DAT</License>
+        <License>%PSX_LICENSE_PATH%/%PSX_LICENSE%.DAT</License>
     </Description>
     <Track>
         <File    name = "SYSTEM.CNF">System.cnf.subst</File>
-        <!--For pkg use: SLES_000.25;1 or SLUS_001.51;1 - no japanse version yet. Otherwise leave as "XXXX_AAA.AA"-->
-        <Main    name = "%BOOT_FILE%" lba_source = "../application/src/asset_mgr.cpp">../application/bin/%TV_FORMAT%/PSX-release/PoolBox.psexe</Main>
-        <Overlay name = "CTO.BIN"     lba_source = "../application/src/Overlay/ControllerTest/controller_test_assets.cpp">../application/bin/%TV_FORMAT%/PSX-release/Overlay.controller_tests</Overlay>
-        <Overlay name = "GTO.BIN"     lba_source = "../application/src/Overlay/GPUTest/gpu_test_assets.cpp">../application/bin/%TV_FORMAT%/PSX-release/Overlay.gpu_tests</Overlay>
-        <Overlay name = "GTE.BIN">../application/bin/%TV_FORMAT%/PSX-release/Overlay.gte_tests</Overlay>
-        <Overlay name = "FCO.BIN">../application/bin/%TV_FORMAT%/PSX-release/Overlay.font_cycler</Overlay>
-        <Overlay name = "SCO.BIN">../application/bin/%TV_FORMAT%/PSX-release/Overlay.screen_center</Overlay>
+        <Main    name = "%PSX_BOOT_FILE%" lba_source = "../application/src/asset_mgr.cpp">../application/bin/%PSX_TV_FORMAT%/PSX-release/PoolBox.psexe</Main>
+        <Overlay name = "CTO.BIN"     lba_source = "../application/src/Overlay/ControllerTest/controller_test_assets.cpp">../application/bin/%PSX_TV_FORMAT%/PSX-release/Overlay.controller_tests</Overlay>
+        <Overlay name = "GTO.BIN"     lba_source = "../application/src/Overlay/GPUTest/gpu_test_assets.cpp">../application/bin/%PSX_TV_FORMAT%/PSX-release/Overlay.gpu_tests</Overlay>
+        <Overlay name = "GTE.BIN">../application/bin/%PSX_TV_FORMAT%/PSX-release/Overlay.gte_tests</Overlay>
+        <Overlay name = "FCO.BIN">../application/bin/%PSX_TV_FORMAT%/PSX-release/Overlay.font_cycler</Overlay>
+        <Overlay name = "SCO.BIN">../application/bin/%PSX_TV_FORMAT%/PSX-release/Overlay.screen_center</Overlay>
 
         <Directory name="ASSETS" hidden = "true">
             <Directory name = "MAIN">
diff --git a/examples/PoolBox/iso/System.cnf.subst b/examples/PoolBox/iso/System.cnf.subst
index ddce640a..35c95beb 100644
--- a/examples/PoolBox/iso/System.cnf.subst
+++ b/examples/PoolBox/iso/System.cnf.subst
@@ -1,4 +1,4 @@
-BOOT=cdrom:\%BOOT_FILE%;1
+BOOT=cdrom:\%PSX_BOOT_FILE%;1
 TCB=4
 EVENT=10
 STACK=801FFFF0
\ No newline at end of file
diff --git a/mkfile/Makefile b/mkfile/Makefile
index 5a0e4ae4..33b5523d 100644
--- a/mkfile/Makefile
+++ b/mkfile/Makefile
@@ -8,9 +8,9 @@ desubstitute = $(subst !JABYENGINEMODULES,$(JABY_ENGINE_DIR)/include/modules,$(s
 PLATFORM ?= PSX
 
 #Build profile, possible values: release, debug, profile, coverage
-BUILD_DIR     ?= bin/$(TV_FORMAT)
+BUILD_DIR     ?= bin/$(PSX_TV_FORMAT)
 BUILD_PROFILE ?= debug
-TV_FORMAT     ?= PAL
+PSX_TV_FORMAT     ?= PAL
 
 CONFIG_NAME ?= $(PLATFORM)-$(BUILD_PROFILE)
 OUTPUT_DIR   = $(BUILD_DIR)/$(CONFIG_NAME)
@@ -55,7 +55,7 @@ CCFLAGS += -std=c++20 -fmodules-ts
 CCFLAGS += $(CCFLAGS_$(BUILD_PROFILE))
 CCFLAGS += $(ARCHFLAGS)
 CCFLAGS += $(INCLUDES)
-CCFLAGS += -DJABYENGINE_$(TV_FORMAT)
+CCFLAGS += -DJABYENGINE_$(PSX_TV_FORMAT)
 
 #Linker flags
 LDFLAGS_release += -Os
diff --git a/mkfile/PSEXETarget.mk b/mkfile/PSEXETarget.mk
index 5292afd5..85632fa6 100644
--- a/mkfile/PSEXETarget.mk
+++ b/mkfile/PSEXETarget.mk
@@ -8,7 +8,7 @@ JABY_ENGINE_LIB_DIR         = $(JABY_ENGINE_DIR)/lib/PSX-$(BUILD_PROFILE)/$(CUST
 JABY_ENGINE_SUPPORT_LIB_DIR = $(JABY_ENGINE_DIR)/Support/lib/PSX-$(BUILD_PROFILE)
 JABY_ENGINE_SUPPORT_LIBS    = $(addprefix -l,$(SUPPORT_LIBS))
 JABY_ENGINE_SUPPORT_DEPS    = $(addsuffix .a,$(addprefix $(JABY_ENGINE_SUPPORT_LIB_DIR)/lib,$(SUPPORT_LIBS)))
-JABY_ENGINE_LIB_NAME        = JabyEngine_$(TV_FORMAT)
+JABY_ENGINE_LIB_NAME        = JabyEngine_$(PSX_TV_FORMAT)
 
 OVERLAY_TARGET = $(foreach ovl, $(OVERLAYSECTION), $(OUTPUT_DIR)/Overlay$(ovl))
 
diff --git a/src/Library/Library.code-workspace b/src/Library/Library.code-workspace
index dc34b01d..9f76f6c2 100644
--- a/src/Library/Library.code-workspace
+++ b/src/Library/Library.code-workspace
@@ -20,10 +20,10 @@
                 "label": "make",
                 "type": "shell",
                 "windows": {
-                    "command": "wsl make ${input:target} BUILD_PROFILE=${input:build cfg} TV_FORMAT=${input:tv format} CUSTOM_CONFIG=${input:config options}",
+                    "command": "wsl make ${input:target} BUILD_PROFILE=${input:build cfg} PSX_TV_FORMAT=${input:tv format} CUSTOM_CONFIG=${input:config options}",
                 },
                 "linux":   {
-                    "command": "make ${input:target} BUILD_PROFILE=${input:build cfg} TV_FORMAT=${input:tv format} CUSTOM_CONFIG=${input:config options}",
+                    "command": "make ${input:target} BUILD_PROFILE=${input:build cfg} PSX_TV_FORMAT=${input:tv format} CUSTOM_CONFIG=${input:config options}",
                 },
                 "group": "build"
             },
diff --git a/src/Library/MakeAll.mk b/src/Library/MakeAll.mk
index 71898e29..962c404e 100644
--- a/src/Library/MakeAll.mk
+++ b/src/Library/MakeAll.mk
@@ -1,6 +1,6 @@
 define make_one
-$(MAKE) $1 TV_FORMAT=PAL CUSTOM_CONFIG=$2
-$(MAKE) $1 TV_FORMAT=NTSC CUSTOM_CONFIG=$2
+$(MAKE) $1 PSX_TV_FORMAT=PAL CUSTOM_CONFIG=$2
+$(MAKE) $1 PSX_TV_FORMAT=NTSC CUSTOM_CONFIG=$2
 endef
 
 define make_all
diff --git a/src/Library/Makefile b/src/Library/Makefile
index e5422673..4c209cc9 100644
--- a/src/Library/Makefile
+++ b/src/Library/Makefile
@@ -1,7 +1,7 @@
 include ../../mkfile/common/RebuildTarget.mk
 JABY_ENGINE_DIR = ../../
 
-ARTIFACT  = libJabyEngine_$(TV_FORMAT)
+ARTIFACT  = libJabyEngine_$(PSX_TV_FORMAT)
 
 SPLASH_IMAGE      = src/BootLoader/splash_image_pal_boot.hpp
 SPLASH_IMAGE_NTSC = src/BootLoader/splash_image_ntsc_boot.hpp
diff --git a/template/JabyEngine-PSX_Game/Makefile b/template/JabyEngine-PSX_Game/Makefile
index 5d9a2735..fc03908c 100644
--- a/template/JabyEngine-PSX_Game/Makefile
+++ b/template/JabyEngine-PSX_Game/Makefile
@@ -10,24 +10,27 @@ endif
 # Add regions on your own
 # Extend them with what you need
 ifeq ($(REGION),SCEE)
-    export TV_FORMAT=PAL
-    export LICENSE=LICENSEE
+    export PSX_TV_FORMAT=PAL
+    export PSX_LICENSE=LICENSEE
+    export PSX_BOOT_FILE=XXXX_AAA.AA
 endif
 ifeq ($(REGION),SCEA)
-    export TV_FORMAT=NTSC
-    export LICENSE=LICENSEA
+    export PSX_TV_FORMAT=NTSC
+    export PSX_LICENSE=LICENSEA
+    export PSX_BOOT_FILE=XXXX_AAA.AA
 endif
 ifeq ($(REGION),SCEI)
-    export TV_FORMAT=NTSC
-    export LICENSE=LICENSEJ
+    export PSX_TV_FORMAT=NTSC
+    export PSX_LICENSE=LICENSEJ
+    export PSX_BOOT_FILE=XXXX_AAA.AA
 endif
 
-ifndef TV_FORMAT
-$(error TV_FORMAT has not be set! REGION not specified?)
+ifndef PSX_TV_FORMAT
+$(error PSX_TV_FORMAT has not be set! REGION not specified?)
 endif
 
-ifndef LICENSE
-$(error LICENSE has not be set! REGION not specified?)
+ifndef PSX_LICENSE
+$(error PSX_LICENSE has not be set! REGION not specified?)
 endif
 
 all clean rebuild: |assets_$(MAKECMDGOALS) application_$(MAKECMDGOALS) cd_$(MAKECMDGOALS)  
diff --git a/template/JabyEngine-PSX_Game/iso/Config.xml b/template/JabyEngine-PSX_Game/iso/Config.xml
index db5d56d7..f085a63a 100644
--- a/template/JabyEngine-PSX_Game/iso/Config.xml
+++ b/template/JabyEngine-PSX_Game/iso/Config.xml
@@ -1,11 +1,10 @@
 <ISO_Project>
     <Description>
         <!--<Publisher>Jaby</Publisher>-->
-        <!--<License>%PSX_LICENSE_PATH%/%LICENSE%.DAT</License>-->
+        <!--<License>%PSX_LICENSE_PATH%/%PSX_LICENSE%.DAT</License>-->
     </Description>
     <Track>
-        <File name="SYSTEM.CNF">System.cnf</File>
-        <!--For pkg use: SLES_000.25;1 or SLUS_001.51;1 - no japanse version yet. Otherwise leave as "XXXX_AAA.AA"-->
-        <Main name="XXXX_AAA.AA">../application/bin/%TV_FORMAT%/PSX-release/#{ProjectName}.psexe</Main>
+        <File name = "SYSTEM.CNF">System.cnf.subst</File>
+        <Main name = "%PSX_BOOT_FILE%">../application/bin/%PSX_TV_FORMAT%/PSX-release/#{ProjectName}.psexe</Main>
     </Track>
 </ISO_Project>
\ No newline at end of file
diff --git a/template/JabyEngine-PSX_Game/iso/System.cnf b/template/JabyEngine-PSX_Game/iso/System.cnf
deleted file mode 100644
index bf22c6f7..00000000
--- a/template/JabyEngine-PSX_Game/iso/System.cnf
+++ /dev/null
@@ -1,4 +0,0 @@
-BOOT=cdrom:\XXXX_AAA.AA;1
-TCB=4
-EVENT=10
-STACK=801FFFF0
\ No newline at end of file
diff --git a/template/JabyEngine-PSX_Game/iso/System.cnf.subst b/template/JabyEngine-PSX_Game/iso/System.cnf.subst
new file mode 100644
index 00000000..35c95beb
--- /dev/null
+++ b/template/JabyEngine-PSX_Game/iso/System.cnf.subst
@@ -0,0 +1,4 @@
+BOOT=cdrom:\%PSX_BOOT_FILE%;1
+TCB=4
+EVENT=10
+STACK=801FFFF0
\ No newline at end of file