From fdaefa45503f922ec333fe8019e9d04f473fd7e9 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon.rozman@amebis.si>
Date: Fri, 7 Mar 2014 09:49:49 +0000
Subject: [PATCH] Win32\Release, Win32\Debug, x64\Release, x64\Debug =>
 Win32.Release, Win32.Debug, x64.Release, x64.Debug

---
 CAB.mak          |  10 +-
 Jedro/Makefile   | 288 +++++++++++++++++++++++------------------------
 MSM.mak          |  52 ++++-----
 Makefile         | 172 ++++++++++++++--------------
 UI/Makefile      | 122 ++++++++++----------
 Verzija/Makefile |  38 +++----
 6 files changed, 341 insertions(+), 341 deletions(-)

diff --git a/CAB.mak b/CAB.mak
index 24c4438..b989f11 100644
--- a/CAB.mak
+++ b/CAB.mak
@@ -16,12 +16,12 @@ MSI_NASTAVI_CAB_STIKALA=/V
 MSI_NASTAVI_CAB_STIKALA=
 !ENDIF
 
-!IFNDEF MSI_URL_AVTORJA
-!ERROR Spremenljivka MSI_URL_AVTORJA ni definirana!
+!IFNDEF MSIBUILD_VENDOR_URL
+!ERROR Spremenljivka MSIBUILD_VENDOR_URL ni definirana!
 !ENDIF
 
-!IFNDEF MSI_IME_IZDELKA
-!ERROR Spremenljivka MSI_IME_IZDELKA ni definirana!
+!IFNDEF MSIBUILD_PRODUCT_NAME
+!ERROR Spremenljivka MSIBUILD_PRODUCT_NAME ni definirana!
 !ENDIF
 
 !IFNDEF IMENIK_ASKUPNO
@@ -43,7 +43,7 @@ Vse : \
 	cscript.exe "$(IMENIK_ASKUPNO)\MSI.wsf" //Job:NastaviCAB //Nologo "$(@:"=).tmp" "$(MSI_DATOTEKA_INF)" $(MSI_NASTAVI_CAB_STIKALA)
 	msiinfo.exe "$(@:"=).tmp" /nologo /U 4
 !IFDEF MANIFESTCERTIFICATETHUMBPRINT
-	signcode.exe -i "$(MSI_URL_AVTORJA)" -sha1 "$(MANIFESTCERTIFICATETHUMBPRINT)" -t "$(MANIFESTTIMESTAMPURL)" -n "$(MSI_IME_IZDELKA)" "$(@:"=).tmp" > NUL
+	signcode.exe -i "$(MSIBUILD_VENDOR_URL)" -sha1 "$(MANIFESTCERTIFICATETHUMBPRINT)" -t "$(MANIFESTTIMESTAMPURL)" -n "$(MSIBUILD_PRODUCT_NAME)" "$(@:"=).tmp" > NUL
 !ENDIF
 	attrib.exe +r "$(@:"=).tmp"
 	move /y "$(@:"=).tmp" $@ > NUL
diff --git a/Jedro/Makefile b/Jedro/Makefile
index 0a656ea..b727437 100644
--- a/Jedro/Makefile
+++ b/Jedro/Makefile
@@ -1,17 +1,17 @@
-!INCLUDE "..\..\..\include\MSINast.mak"
+!INCLUDE "..\..\..\include\MSIBuildCfg.mak"
 !IFDEF MSM_IMA_VERZIJO
 !INCLUDE "..\Verzija\Verzija.mak"
 !ENDIF
 
-MSM_IMA_LOKALIZACIJO=1
+MSIBUILD_IS_LOCALIZEABLE=1
 
-MSI_POLNO_IME_IZDELKA=$(MSI_IME_IZDELKA) $(MSI_VERZIJA_STR)
+MSI_POLNO_IME_IZDELKA=$(MSIBUILD_PRODUCT_NAME) $(MSI_VERZIJA_STR)
 !IF "$(CFG)" == "Debug"
 MSI_POLNO_IME_IZDELKA=$(MSI_POLNO_IME_IZDELKA) Diag
 !ENDIF
-!IFDEF MSI_IMA_TUDI_X64
-!IFDEF MSI_PLATFORMA
-MSI_POLNO_IME_IZDELKA=$(MSI_POLNO_IME_IZDELKA) $(MSI_PLATFORMA)
+!IFDEF MSIBUILD_HAS_X64
+!IFDEF PLAT
+MSI_POLNO_IME_IZDELKA=$(MSI_POLNO_IME_IZDELKA) $(PLAT)
 !ENDIF
 !ENDIF
 
@@ -26,9 +26,9 @@ MSI_POLNO_IME_IZDELKA=$(MSI_POLNO_IME_IZDELKA) $(MSI_PLATFORMA)
 ######################################################################
 # ___
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).___-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).___-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).___-1.idt" : "Makefile" "..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).___-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 <<NOKEEP
@@ -38,15 +38,15 @@ Vse :: "$(JEZIK).$(CFG).$(PLAT).___-1.idt"
 # ___
 
 Vse :: \
-	"$(JEZIK).$(CFG).$(PLAT).___-1.idt" \
-	"$(JEZIK).$(CFG).$(PLAT).___-2.idt"
+	"$(LANG).$(CFG).$(PLAT).___-1.idt" \
+	"$(LANG).$(CFG).$(PLAT).___-2.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).___-1.idt" : "Makefile" "..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).___-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 <<NOKEEP
 
-"Sl.$(CFG).$(PLAT).___-2.idtx" : "Makefile" "..\..\include\MSINast.mak"
+"Sl.$(CFG).$(PLAT).___-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 <<NOKEEP
@@ -69,9 +69,9 @@ Vse :: \
 ######################################################################
 # _Validation
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT)._Validation-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT)._Validation-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT)._Validation-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT)._Validation-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Table	Column	Nullable	MinValue	MaxValue	KeyTable	KeyColumn	Category	Set	Description
@@ -510,13 +510,13 @@ Verb	Verb	N					Text		The verb for the command.
 ######################################################################
 # ActionText
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).ActionText-2.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).ActionText-2.idt"
 
-"Sl.$(CFG).$(PLAT).ActionText-2.idtx" : "Makefile" "..\..\..\include\MSINast.mak"
+"Sl.$(CFG).$(PLAT).ActionText-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Action	Description	Template
-s$(MSI_TIP_ID)	L0	L0
+s$(MSIBUILD_LENGTH_ID)	L0	L0
 1250	ActionText	Action
 Advertise	Program za oglaševanje	
 AllocateRegistrySpace	Rezervacija prostora v sistemskem registru	Nezaseden prostor: [1]
@@ -606,13 +606,13 @@ WriteRegistryValues	Zapisovanje vrednosti v sistemski register	Klju
 ######################################################################
 # AdminExecuteSequence
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).AdminExecuteSequence-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).AdminExecuteSequence-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).AdminExecuteSequence-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).AdminExecuteSequence-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Action	Condition	Sequence
-s$(MSI_TIP_ID)	S255	I2
+s$(MSIBUILD_LENGTH_ID)	S255	I2
 AdminExecuteSequence	Action
 CostInitialize		800
 FileCost		900
@@ -628,13 +628,13 @@ InstallFinalize		6600
 ######################################################################
 # AdvtExecuteSequence
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).AdvtExecuteSequence-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).AdvtExecuteSequence-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).AdvtExecuteSequence-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).AdvtExecuteSequence-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Action	Condition	Sequence
-s$(MSI_TIP_ID)	S255	I2
+s$(MSIBUILD_LENGTH_ID)	S255	I2
 AdvtExecuteSequence	Action
 CostInitialize		800
 CostFinalize		1000
@@ -655,13 +655,13 @@ InstallFinalize		6600
 ######################################################################
 # AppSearch
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).AppSearch-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).AppSearch-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).AppSearch-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).AppSearch-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Property	Signature_
-s$(MSI_TIP_ID)	s$(MSI_TIP_ID)
+s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)
 AppSearch	Property	Signature_
 <<NOKEEP
 
@@ -669,9 +669,9 @@ AppSearch	Property	Signature_
 ######################################################################
 # BBControl
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).BBControl-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).BBControl-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).BBControl-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).BBControl-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Billboard_	BBControl	Type	X	Y	Width	Height	Attributes	Text
@@ -683,13 +683,13 @@ BBControl	Billboard_	BBControl
 ######################################################################
 # Billboard
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).Billboard-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).Billboard-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).Billboard-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).Billboard-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Billboard	Feature_	Action	Ordering
-s50	s$(MSI_TIP_ID)	S50	I2
+s50	s$(MSIBUILD_LENGTH_ID)	S50	I2
 Billboard	Billboard
 <<NOKEEP
 
@@ -698,14 +698,14 @@ Billboard	Billboard
 # Binary
 
 Vse :: \
-	"$(JEZIK).$(CFG).$(PLAT).Binary-1" \
-	"$(JEZIK).$(CFG).$(PLAT).Binary-1.idt"
+	"$(LANG).$(CFG).$(PLAT).Binary-1" \
+	"$(LANG).$(CFG).$(PLAT).Binary-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).Binary-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).Binary-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Name	Data
-s$(MSI_TIP_ID)	v0
+s$(MSIBUILD_LENGTH_ID)	v0
 Binary	Name
 <<NOKEEP
 
@@ -713,13 +713,13 @@ Binary	Name
 ######################################################################
 # CheckBox
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).CheckBox-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).CheckBox-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).CheckBox-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).CheckBox-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Property	Value
-s$(MSI_TIP_ID)	S64
+s$(MSIBUILD_LENGTH_ID)	S64
 CheckBox	Property
 <<NOKEEP
 
@@ -727,13 +727,13 @@ CheckBox	Property
 ######################################################################
 # ComboBox
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).ComboBox-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).ComboBox-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).ComboBox-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).ComboBox-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Property	Order	Value	Text
-s$(MSI_TIP_ID)	i2	s64	L64
+s$(MSIBUILD_LENGTH_ID)	i2	s64	L64
 ComboBox	Property	Order
 <<NOKEEP
 
@@ -741,13 +741,13 @@ ComboBox	Property	Order
 ######################################################################
 # Control
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).Control-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).Control-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).Control-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).Control-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Dialog_	Control	Type	X	Y	Width	Height	Attributes	Property	Text	Control_Next	Help
-s$(MSI_TIP_ID)	s50	s20	i2	i2	i2	i2	I4	S50	L0	S50	L$(MSI_TIP_POMOC)
+s$(MSIBUILD_LENGTH_ID)	s50	s20	i2	i2	i2	i2	I4	S50	L0	S50	L$(MSIBUILD_LENGTH_HELP)
 Control	Dialog_	Control
 <<NOKEEP
 
@@ -755,13 +755,13 @@ Control	Dialog_	Control
 ######################################################################
 # ControlCondition
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).ControlCondition-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).ControlCondition-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).ControlCondition-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).ControlCondition-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Dialog_	Control_	Action	Condition
-s$(MSI_TIP_ID)	s50	s50	s255
+s$(MSIBUILD_LENGTH_ID)	s50	s50	s255
 ControlCondition	Dialog_	Control_	Action	Condition
 <<NOKEEP
 
@@ -769,13 +769,13 @@ ControlCondition	Dialog_	Control_	Action	Condition
 ######################################################################
 # ControlEvent
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).ControlEvent-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).ControlEvent-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).ControlEvent-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).ControlEvent-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Dialog_	Control_	Event	Argument	Condition	Ordering
-s$(MSI_TIP_ID)	s50	s50	s255	S255	I2
+s$(MSIBUILD_LENGTH_ID)	s50	s50	s255	S255	I2
 ControlEvent	Dialog_	Control_	Event	Argument	Condition
 <<NOKEEP
 
@@ -783,13 +783,13 @@ ControlEvent	Dialog_	Control_	Event	Argument	Condition
 ######################################################################
 # CreateFolder
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).CreateFolder-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).CreateFolder-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).CreateFolder-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).CreateFolder-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Directory_	Component_
-s$(MSI_TIP_ID)	s$(MSI_TIP_ID)
+s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)
 CreateFolder	Directory_	Component_
 <<NOKEEP
 
@@ -797,13 +797,13 @@ CreateFolder	Directory_	Component_
 ######################################################################
 # CustomAction
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).CustomAction-2.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).CustomAction-2.idt"
 
-"Sl.$(CFG).$(PLAT).CustomAction-2.idtx" : "Makefile" "..\..\..\include\MSINast.mak"
+"Sl.$(CFG).$(PLAT).CustomAction-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Action	Type	Source	Target
-s$(MSI_TIP_ID)	i2	S$(MSI_TIP_ID)	S255
+s$(MSIBUILD_LENGTH_ID)	i2	S$(MSIBUILD_LENGTH_ID)	S255
 1250	CustomAction	Action
 caNewerProductFound	19		Novejša verzija programskega paketa [SimpleProductName] je že nameščena.
 caFaultyProductFound	19		Ta namestitveni paket ne more nadgraditi trenutno nameščenega programskega paketa [SimpleProductName]. Prosimo, najprej odstranite nameščeni programski paket in nato poskusite ponovno.
@@ -825,13 +825,13 @@ caFaultyProductFound	19		Ta namestitveni paket ne more nadgraditi trenutno name
 ######################################################################
 # Dialog
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).Dialog-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).Dialog-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).Dialog-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).Dialog-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Dialog	HCentering	VCentering	Width	Height	Attributes	Title	Control_First	Control_Default	Control_Cancel
-s$(MSI_TIP_ID)	i2	i2	i2	i2	I4	L128	s50	S50	S50
+s$(MSIBUILD_LENGTH_ID)	i2	i2	i2	i2	I4	L128	s50	S50	S50
 Dialog	Dialog
 <<NOKEEP
 
@@ -839,9 +839,9 @@ Dialog	Dialog
 ######################################################################
 # Error
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).Error-2.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).Error-2.idt"
 
-"Sl.$(CFG).$(PLAT).Error-2.idtx" : "Makefile" "..\..\..\include\MSINast.mak"
+"Sl.$(CFG).$(PLAT).Error-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Error	Message
@@ -1026,13 +1026,13 @@ i2	L0
 ######################################################################
 # EventMapping
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).EventMapping-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).EventMapping-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).EventMapping-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).EventMapping-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Dialog_	Control_	Event	Attribute
-s$(MSI_TIP_ID)	s50	s50	s50
+s$(MSIBUILD_LENGTH_ID)	s50	s50	s50
 EventMapping	Dialog_	Control_	Event
 <<NOKEEP
 
@@ -1040,13 +1040,13 @@ EventMapping	Dialog_	Control_	Event
 ######################################################################
 # Extension
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).Extension-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).Extension-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).Extension-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).Extension-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Extension	Component_	ProgId_	MIME_	Feature_
-s255	s$(MSI_TIP_ID)	S255	S$(MSI_TIP_ID)	s$(MSI_TIP_ID)
+s255	s$(MSIBUILD_LENGTH_ID)	S255	S$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)
 Extension	Extension	Component_
 <<NOKEEP
 
@@ -1054,13 +1054,13 @@ Extension	Extension	Component_
 ######################################################################
 # InstallExecuteSequence
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).InstallExecuteSequence-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).InstallExecuteSequence-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).InstallExecuteSequence-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).InstallExecuteSequence-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Action	Condition	Sequence
-s$(MSI_TIP_ID)	S255	I2
+s$(MSIBUILD_LENGTH_ID)	S255	I2
 InstallExecuteSequence	Action
 LaunchConditions	NOT Installed	100
 FindRelatedProducts		200
@@ -1132,13 +1132,13 @@ RemoveExistingProducts		6700
 ######################################################################
 # InstallUISequence
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).InstallUISequence-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).InstallUISequence-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).InstallUISequence-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).InstallUISequence-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Action	Condition	Sequence
-s$(MSI_TIP_ID)	S255	I2
+s$(MSIBUILD_LENGTH_ID)	S255	I2
 InstallUISequence	Action
 LaunchConditions	NOT Installed	100
 FindRelatedProducts		200
@@ -1158,9 +1158,9 @@ ExecuteAction		1300
 ######################################################################
 # LaunchCondition
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).LaunchCondition-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).LaunchCondition-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).LaunchCondition-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).LaunchCondition-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Condition	Description
@@ -1172,13 +1172,13 @@ LaunchCondition	Condition
 ######################################################################
 # ListBox
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).ListBox-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).ListBox-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).ListBox-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).ListBox-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Property	Order	Value	Text
-s$(MSI_TIP_ID)	i2	s64	L64
+s$(MSIBUILD_LENGTH_ID)	i2	s64	L64
 ListBox	Property	Order
 <<NOKEEP
 
@@ -1186,13 +1186,13 @@ ListBox	Property	Order
 ######################################################################
 # ListView
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).ListView-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).ListView-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).ListView-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).ListView-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Property	Order	Value	Text	Binary_
-s$(MSI_TIP_ID)	i2	s64	L64	S$(MSI_TIP_ID)
+s$(MSIBUILD_LENGTH_ID)	i2	s64	L64	S$(MSIBUILD_LENGTH_ID)
 ListView	Property	Order
 <<NOKEEP
 
@@ -1200,13 +1200,13 @@ ListView	Property	Order
 ######################################################################
 # LockPermissions
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).LockPermissions-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).LockPermissions-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).LockPermissions-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).LockPermissions-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 LockObject	Table	Domain	User	Permission
-s$(MSI_TIP_ID)	s32	S255	s255	I4
+s$(MSIBUILD_LENGTH_ID)	s32	S255	s255	I4
 LockPermissions	LockObject	Table	Domain	User
 <<NOKEEP
 
@@ -1214,13 +1214,13 @@ LockPermissions	LockObject	Table	Domain	User
 ######################################################################
 # ModuleComponents
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).ModuleComponents-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).ModuleComponents-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).ModuleComponents-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).ModuleComponents-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Component	ModuleID	Language
-s$(MSI_TIP_ID)	s$(MSI_TIP_ID)	i2
+s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	i2
 ModuleComponents	Component	ModuleID	Language
 <<NOKEEP
 
@@ -1228,13 +1228,13 @@ ModuleComponents	Component	ModuleID	Language
 ######################################################################
 # ModuleDependency
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).ModuleDependency-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).ModuleDependency-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).ModuleDependency-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).ModuleDependency-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 ModuleID	ModuleLanguage	RequiredID	RequiredLanguage	RequiredVersion
-s$(MSI_TIP_ID)	i2	s$(MSI_TIP_ID)	i2	S32
+s$(MSIBUILD_LENGTH_ID)	i2	s$(MSIBUILD_LENGTH_ID)	i2	S32
 ModuleDependency	ModuleID	ModuleLanguage	RequiredID	RequiredLanguage
 <<NOKEEP
 
@@ -1242,13 +1242,13 @@ ModuleDependency	ModuleID	ModuleLanguage	RequiredID	RequiredLanguage
 ######################################################################
 # ModuleSignature
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).ModuleSignature-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).ModuleSignature-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).ModuleSignature-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).ModuleSignature-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 ModuleID	Language	Version
-s$(MSI_TIP_ID)	i2	s20
+s$(MSIBUILD_LENGTH_ID)	i2	s20
 ModuleSignature	ModuleID	Language
 <<NOKEEP
 
@@ -1256,13 +1256,13 @@ ModuleSignature	ModuleID	Language
 ######################################################################
 # MsiAssembly
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).MsiAssembly-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).MsiAssembly-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).MsiAssembly-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).MsiAssembly-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Component_	Feature_	File_Manifest	File_Application	Attributes
-s$(MSI_TIP_ID)	s$(MSI_TIP_ID)	S$(MSI_TIP_ID)	S$(MSI_TIP_ID)	I2
+s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	S$(MSIBUILD_LENGTH_ID)	S$(MSIBUILD_LENGTH_ID)	I2
 MsiAssembly	Component_
 <<NOKEEP
 
@@ -1270,13 +1270,13 @@ MsiAssembly	Component_
 ######################################################################
 # MsiAssemblyName
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).MsiAssemblyName-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).MsiAssemblyName-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).MsiAssemblyName-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).MsiAssemblyName-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Component_	Name	Value
-s$(MSI_TIP_ID)	s255	s255
+s$(MSIBUILD_LENGTH_ID)	s255	s255
 MsiAssemblyName	Component_	Name
 <<NOKEEP
 
@@ -1284,13 +1284,13 @@ MsiAssemblyName	Component_	Name
 ######################################################################
 # MsiFileHash
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).MsiFileHash-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).MsiFileHash-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).MsiFileHash-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).MsiFileHash-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 File_	Options	HashPart1	HashPart2	HashPart3	HashPart4
-s$(MSI_TIP_ID)	i2	i4	i4	i4	i4
+s$(MSIBUILD_LENGTH_ID)	i2	i4	i4	i4	i4
 MsiFileHash	File_
 <<NOKEEP
 
@@ -1298,13 +1298,13 @@ MsiFileHash	File_
 ######################################################################
 # MsiSFCBypass
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).MsiSFCBypass-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).MsiSFCBypass-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).MsiSFCBypass-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).MsiSFCBypass-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 File_
-s$(MSI_TIP_ID)
+s$(MSIBUILD_LENGTH_ID)
 MsiSFCBypass	File_
 <<NOKEEP
 
@@ -1313,43 +1313,43 @@ MsiSFCBypass	File_
 # Property
 
 Vse :: \
-	"$(JEZIK).$(CFG).$(PLAT).Property-1.idt" \
-	"$(JEZIK).$(CFG).$(PLAT).Property-2.idt"
+	"$(LANG).$(CFG).$(PLAT).Property-1.idt" \
+	"$(LANG).$(CFG).$(PLAT).Property-2.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).Property-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).Property-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Property	Value
-s$(MSI_TIP_ID)	l0
+s$(MSIBUILD_LENGTH_ID)	l0
 Property	Property
-!IFDEF MSI_URL_AVTORJA
-ARPURLINFOABOUT	$(MSI_URL_AVTORJA)
+!IFDEF MSIBUILD_VENDOR_URL
+ARPURLINFOABOUT	$(MSIBUILD_VENDOR_URL)
 !ENDIF
-!IFDEF MSI_NASLOV_AVTORJA
-ARPCONTACT	$(MSI_NASLOV_AVTORJA)
+!IFDEF MSIBUILD_VENDOR_ADDRESS
+ARPCONTACT	$(MSIBUILD_VENDOR_ADDRESS)
 !ENDIF
-!IFDEF MSI_TEL_AVTORJA
-ARPHELPTELEPHONE	$(MSI_TEL_AVTORJA)
+!IFDEF MSIBUILD_VENDOR_PHONE
+ARPHELPTELEPHONE	$(MSIBUILD_VENDOR_PHONE)
 !ENDIF
-!IFDEF MSI_URL_IZDELKA
-ARPHELPLINK	$(MSI_URL_IZDELKA)
+!IFDEF MSIBUILD_PRODUCT_URL
+ARPHELPLINK	$(MSIBUILD_PRODUCT_URL)
 !ENDIF
-!IFDEF MSI_URL_NADGRADNJE
-ARPURLUPDATEINFO	$(MSI_URL_NADGRADNJE)
+!IFDEF MSIBUILD_PRODUCT_UPGRADE_URL
+ARPURLUPDATEINFO	$(MSIBUILD_PRODUCT_UPGRADE_URL)
 !ENDIF
-Manufacturer	$(MSI_AVTOR)
+Manufacturer	$(MSIBUILD_VENDOR_NAME)
 MSICHECKCRCS	1
 ProductID	none
 ProductName	$(MSI_POLNO_IME_IZDELKA)
-SimpleProductName	$(MSI_IME_IZDELKA)
+SimpleProductName	$(MSIBUILD_PRODUCT_NAME)
 PROMPTROLLBACKCOST	P
 <<NOKEEP
 
-"Sl.$(CFG).$(PLAT).Property-2.idtx" : "Makefile" "..\..\..\include\MSINast.mak"
+"Sl.$(CFG).$(PLAT).Property-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Property	Value
-s$(MSI_TIP_ID)	l0
+s$(MSIBUILD_LENGTH_ID)	l0
 1250	Property	Property
 ProductLanguage	1060
 <<NOKEEP
@@ -1370,13 +1370,13 @@ ProductLanguage	1060
 ######################################################################
 # RadioButton
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).RadioButton-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).RadioButton-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).RadioButton-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).RadioButton-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Property	Order	Value	X	Y	Width	Height	Text	Help
-s$(MSI_TIP_ID)	i2	s64	i2	i2	i2	i2	L64	L$(MSI_TIP_POMOC)
+s$(MSIBUILD_LENGTH_ID)	i2	s64	i2	i2	i2	i2	L64	L$(MSIBUILD_LENGTH_HELP)
 RadioButton	Property	Order
 <<NOKEEP
 
@@ -1384,13 +1384,13 @@ RadioButton	Property	Order
 ######################################################################
 # RegLocator
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).RegLocator-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).RegLocator-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).RegLocator-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).RegLocator-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Signature_	Root	Key	Name	Type
-s$(MSI_TIP_ID)	i2	s255	S255	I2
+s$(MSIBUILD_LENGTH_ID)	i2	s255	S255	I2
 RegLocator	Signature_
 <<NOKEEP
 
@@ -1398,13 +1398,13 @@ RegLocator	Signature_
 ######################################################################
 # Signature
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).Signature-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).Signature-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).Signature-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).Signature-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Signature	FileName	MinVersion	MaxVersion	MinSize	MaxSize	MinDate	MaxDate	Languages
-s$(MSI_TIP_ID)	s255	S20	S20	I4	I4	I4	I4	S255
+s$(MSIBUILD_LENGTH_ID)	s255	S20	S20	I4	I4	I4	I4	S255
 Signature	Signature
 <<NOKEEP
 
@@ -1412,13 +1412,13 @@ Signature	Signature
 ######################################################################
 # SxsMsmGenComponents
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).SxsMsmGenComponents-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).SxsMsmGenComponents-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).SxsMsmGenComponents-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).SxsMsmGenComponents-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Component_	Guid
-s$(MSI_TIP_ID)	s38
+s$(MSIBUILD_LENGTH_ID)	s38
 SxsMsmGenComponents	Component_
 <<NOKEEP
 
@@ -1426,13 +1426,13 @@ SxsMsmGenComponents	Component_
 ######################################################################
 # TextStyle
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).TextStyle-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).TextStyle-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).TextStyle-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).TextStyle-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 TextStyle	FaceName	Size	Color	StyleBits
-s$(MSI_TIP_ID)	s32	i2	I4	I2
+s$(MSIBUILD_LENGTH_ID)	s32	i2	I4	I2
 TextStyle	TextStyle
 <<NOKEEP
 
@@ -1440,13 +1440,13 @@ TextStyle	TextStyle
 ######################################################################
 # TypeLib
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).TypeLib-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).TypeLib-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).TypeLib-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).TypeLib-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 LibID	Language	Component_	Version	Description	Directory_	Feature_	Cost
-s38	i2	s$(MSI_TIP_ID)	I2	L128	S$(MSI_TIP_ID)	s$(MSI_TIP_ID)	I4
+s38	i2	s$(MSIBUILD_LENGTH_ID)	I2	L128	S$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	I4
 TypeLib	LibID	Language	Component_
 <<NOKEEP
 
@@ -1454,13 +1454,13 @@ TypeLib	LibID	Language	Component_
 ######################################################################
 # UIText
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).UIText-2.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).UIText-2.idt"
 
-"Sl.$(CFG).$(PLAT).UIText-2.idtx" : "Makefile" "..\..\..\include\MSINast.mak"
+"Sl.$(CFG).$(PLAT).UIText-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Key	Text
-s$(MSI_TIP_ID)	L255
+s$(MSIBUILD_LENGTH_ID)	L255
 1250	UIText	Key
 AbsentPath	
 bytes	 bajtov
diff --git a/MSM.mak b/MSM.mak
index be98440..860a1dd 100644
--- a/MSM.mak
+++ b/MSM.mak
@@ -1,35 +1,35 @@
-Vse :: "$(JEZIK).$(CFG).$(PLAT).msm"
+Vse :: "$(LANG).$(CFG).$(PLAT).msm"
 
 Pocisti ::
-	-if exist "$(JEZIK).$(CFG).$(PLAT).*-1.idt"      del /f /q "$(JEZIK).$(CFG).$(PLAT).*-1.idt"
-	-if exist "$(JEZIK).$(CFG).$(PLAT).Binary-1\*.*" del /f /q "$(JEZIK).$(CFG).$(PLAT).Binary-1\*.*"
-	-if exist "$(JEZIK).$(CFG).$(PLAT).Icon-1\*.*"   del /f /q "$(JEZIK).$(CFG).$(PLAT).Icon-1\*.*"
-!IFDEF MSM_IMA_LOKALIZACIJO
-	-if exist "$(JEZIK).$(CFG).$(PLAT).*-2.idt"      del /f /q "$(JEZIK).$(CFG).$(PLAT).*-2.idt"
-	-if exist "$(JEZIK).$(CFG).$(PLAT).*-2.idtx"     del /f /q "$(JEZIK).$(CFG).$(PLAT).*-2.idtx"
-	-if exist "$(JEZIK).$(CFG).$(PLAT).Binary-2\*.*" del /f /q "$(JEZIK).$(CFG).$(PLAT).Binary-2\*.*"
-	-if exist "$(JEZIK).$(CFG).$(PLAT).Icon-2\*.*"   del /f /q "$(JEZIK).$(CFG).$(PLAT).Icon-2\*.*"
+	-if exist "$(LANG).$(CFG).$(PLAT).*-1.idt"      del /f /q "$(LANG).$(CFG).$(PLAT).*-1.idt"
+	-if exist "$(LANG).$(CFG).$(PLAT).Binary-1\*.*" del /f /q "$(LANG).$(CFG).$(PLAT).Binary-1\*.*"
+	-if exist "$(LANG).$(CFG).$(PLAT).Icon-1\*.*"   del /f /q "$(LANG).$(CFG).$(PLAT).Icon-1\*.*"
+!IFDEF MSIBUILD_IS_LOCALIZEABLE
+	-if exist "$(LANG).$(CFG).$(PLAT).*-2.idt"      del /f /q "$(LANG).$(CFG).$(PLAT).*-2.idt"
+	-if exist "$(LANG).$(CFG).$(PLAT).*-2.idtx"     del /f /q "$(LANG).$(CFG).$(PLAT).*-2.idtx"
+	-if exist "$(LANG).$(CFG).$(PLAT).Binary-2\*.*" del /f /q "$(LANG).$(CFG).$(PLAT).Binary-2\*.*"
+	-if exist "$(LANG).$(CFG).$(PLAT).Icon-2\*.*"   del /f /q "$(LANG).$(CFG).$(PLAT).Icon-2\*.*"
 !ENDIF
-	-if exist "$(JEZIK).$(CFG).$(PLAT).lst"          del /f /q "$(JEZIK).$(CFG).$(PLAT).lst"
-	-if exist "$(JEZIK).$(CFG).$(PLAT).msm"          del /f /q "$(JEZIK).$(CFG).$(PLAT).msm"
+	-if exist "$(LANG).$(CFG).$(PLAT).lst"          del /f /q "$(LANG).$(CFG).$(PLAT).lst"
+	-if exist "$(LANG).$(CFG).$(PLAT).msm"          del /f /q "$(LANG).$(CFG).$(PLAT).msm"
 
 
 ######################################################################
 # Izdelava modula
 ######################################################################
 
-!IFDEF MSM_IMA_LOKALIZACIJO
+!IFDEF MSIBUILD_IS_LOCALIZEABLE
 
 ######################################################################
 # Ker orodje msidb ne zna pravilno prilepiti v modul tabel iz datotek
 # IDL, naredimo ločeno dva modula in jih nato zlepimo.
 
-"$(JEZIK).$(CFG).$(PLAT).msm" : $(JEZIK).$(CFG).$(PLAT).*-1.idt $(JEZIK).$(CFG).$(PLAT).*-2.idt
+"$(LANG).$(CFG).$(PLAT).msm" : $(LANG).$(CFG).$(PLAT).*-1.idt $(LANG).$(CFG).$(PLAT).*-2.idt
 	-if exist $@ del /f /q $@
 	-if exist "$(@:"=)-1.tmp" del /f /q "$(@:"=)-1.tmp"
 	-if exist "$(@:"=)-2.tmp" del /f /q "$(@:"=)-2.tmp"
-	msidb.exe -c -d "$(@:"=)-1.tmp" -f "$(MAKEDIR)" -i $(JEZIK).$(CFG).$(PLAT).*-1.idt
-	msidb.exe -c -d "$(@:"=)-2.tmp" -f "$(MAKEDIR)" -i $(JEZIK).$(CFG).$(PLAT).*-2.idt
+	msidb.exe -c -d "$(@:"=)-1.tmp" -f "$(MAKEDIR)" -i $(LANG).$(CFG).$(PLAT).*-1.idt
+	msidb.exe -c -d "$(@:"=)-2.tmp" -f "$(MAKEDIR)" -i $(LANG).$(CFG).$(PLAT).*-2.idt
 	msidb.exe -d "$(@:"=)-1.tmp" -m "$(@:"=)-2.tmp"
 	del /f /q "$(@:"=)-2.tmp"
 	move /y "$(@:"=)-1.tmp" $@ > NUL
@@ -39,10 +39,10 @@ Pocisti ::
 ######################################################################
 # Modul ni lokaliziran, zato je njegova izdelava trivialna.
 
-"$(JEZIK).$(CFG).$(PLAT).msm" : $(JEZIK).$(CFG).$(PLAT).*-1.idt
+"$(LANG).$(CFG).$(PLAT).msm" : $(LANG).$(CFG).$(PLAT).*-1.idt
 	-if exist $@ del /f /q $@
 	-if exist "$(@:"=)-1.tmp" del /f /q "$(@:"=)-1.tmp"
-	msidb.exe -c -d "$(@:"=)-1.tmp" -f "$(MAKEDIR)" -i $(JEZIK).$(CFG).$(PLAT).*-1.idt
+	msidb.exe -c -d "$(@:"=)-1.tmp" -f "$(MAKEDIR)" -i $(LANG).$(CFG).$(PLAT).*-1.idt
 	move /y "$(@:"=)-1.tmp" $@ > NUL
 
 !ENDIF
@@ -52,31 +52,31 @@ Pocisti ::
 # Odvisnosti
 ######################################################################
 
-"$(JEZIK).$(CFG).$(PLAT).Binary-1.idt" : $(JEZIK).$(CFG).$(PLAT).Binary-1\*.*
+"$(LANG).$(CFG).$(PLAT).Binary-1.idt" : $(LANG).$(CFG).$(PLAT).Binary-1\*.*
 
-"$(JEZIK).$(CFG).$(PLAT).Binary-2.idt" : $(JEZIK).$(CFG).$(PLAT).Binary-2\*.*
+"$(LANG).$(CFG).$(PLAT).Binary-2.idt" : $(LANG).$(CFG).$(PLAT).Binary-2\*.*
 
-"$(JEZIK).$(CFG).$(PLAT).Icon-1.idt" : $(JEZIK).$(CFG).$(PLAT).Icon-1\*.*
+"$(LANG).$(CFG).$(PLAT).Icon-1.idt" : $(LANG).$(CFG).$(PLAT).Icon-1\*.*
 
-"$(JEZIK).$(CFG).$(PLAT).Icon-2.idt" : $(JEZIK).$(CFG).$(PLAT).Icon-2\*.*
+"$(LANG).$(CFG).$(PLAT).Icon-2.idt" : $(LANG).$(CFG).$(PLAT).Icon-2\*.*
 
 
 ######################################################################
 # Ustvarjanje imenikov
 ######################################################################
 
-"$(JEZIK).$(CFG).$(PLAT).Binary-1" :
+"$(LANG).$(CFG).$(PLAT).Binary-1" :
 	if not exist $@ md $@
 
-"$(JEZIK).$(CFG).$(PLAT).Icon-1" :
+"$(LANG).$(CFG).$(PLAT).Icon-1" :
 	if not exist $@ md $@
 
-!IFDEF MSM_IMA_LOKALIZACIJO
+!IFDEF MSIBUILD_IS_LOCALIZEABLE
 
-"$(JEZIK).$(CFG).$(PLAT).Binary-2" :
+"$(LANG).$(CFG).$(PLAT).Binary-2" :
 	if not exist $@ md $@
 
-"$(JEZIK).$(CFG).$(PLAT).Icon-2" :
+"$(LANG).$(CFG).$(PLAT).Icon-2" :
 	if not exist $@ md $@
 
 !ENDIF
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 53b04eb..dcd236a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,53 +1,53 @@
-!IFNDEF MSI_IMENIK_CILJ
-!ERROR Spremenljivka MSI_IMENIK_CILJ ni definirana!
+!IFNDEF MSIBUILD_OUTPUT_DIR
+!ERROR Spremenljivka MSIBUILD_OUTPUT_DIR ni definirana!
 !ENDIF
 
-!IFNDEF MSI_IMENIK_MSM
-!ERROR Spremenljivka MSI_IMENIK_MSM ni definirana!
+!IFNDEF MSIBUILD_ROOT
+!ERROR Spremenljivka MSIBUILD_ROOT ni definirana!
 !ENDIF
 
-!IFNDEF MSI_CILJ
-!ERROR Spremenljivka MSI_CILJ ni definirana!
+!IFNDEF MSIBUILD_TARGET
+!ERROR Spremenljivka MSIBUILD_TARGET ni definirana!
 !ENDIF
 
-!IFNDEF MSI_AVTOR
-!ERROR Spremenljivka MSI_AVTOR ni definirana!
+!IFNDEF MSIBUILD_VENDOR_NAME
+!ERROR Spremenljivka MSIBUILD_VENDOR_NAME ni definirana!
 !ENDIF
 
-!IFNDEF MSI_URL_AVTORJA
-!ERROR Spremenljivka MSI_URL_AVTORJA ni definirana!
+!IFNDEF MSIBUILD_VENDOR_URL
+!ERROR Spremenljivka MSIBUILD_VENDOR_URL ni definirana!
 !ENDIF
 
-!IFNDEF MSI_IME_IZDELKA
-!ERROR Spremenljivka MSI_IME_IZDELKA ni definirana!
+!IFNDEF MSIBUILD_PRODUCT_NAME
+!ERROR Spremenljivka MSIBUILD_PRODUCT_NAME ni definirana!
 !ENDIF
 
-!IFNDEF MSI_OPIS_IZDELKA
-!ERROR Spremenljivka MSI_OPIS_IZDELKA ni definirana!
+!IFNDEF MSIBUILD_PRODUCT_DESC
+!ERROR Spremenljivka MSIBUILD_PRODUCT_DESC ni definirana!
 !ENDIF
 
-!IFNDEF MSI_KODNA_TABELA
-!ERROR Spremenljivka MSI_KODNA_TABELA ni definirana!
+!IFNDEF MSIBUILD_CODEPAGE
+!ERROR Spremenljivka MSIBUILD_CODEPAGE ni definirana!
 !ENDIF
 
-!IFNDEF MSI_PLATFORMA
-MSI_PLATFORMA=Win32
+!IFNDEF PLAT
+PLAT=Win32
 !ENDIF
 
-!IFNDEF MSI_KODA_JEZIKA
-!ERROR Spremenljivka MSI_KODA_JEZIKA ni definirana!
+!IFNDEF MSIBUILD_LANGID
+!ERROR Spremenljivka MSIBUILD_LANGID ni definirana!
 !ENDIF
 
-!IFNDEF MSI_VERZIJA
-!ERROR Spremenljivka MSI_VERZIJA ni definirana!
+!IFNDEF MSIBUILD_MSI_VERSION_MIN
+!ERROR Spremenljivka MSIBUILD_MSI_VERSION_MIN ni definirana!
 !ENDIF
 
-!IFNDEF MSI_TIP_ID
-!ERROR Spremenljivka MSI_TIP_ID ni definirana!
+!IFNDEF MSIBUILD_LENGTH_ID
+!ERROR Spremenljivka MSIBUILD_LENGTH_ID ni definirana!
 !ENDIF
 
-!IFNDEF MSI_TIP_POMOC
-!ERROR Spremenljivka MSI_TIP_POMOC ni definirana!
+!IFNDEF MSIBUILD_LENGTH_HELP
+!ERROR Spremenljivka MSIBUILD_LENGTH_HELP ni definirana!
 !ENDIF
 
 !IFNDEF MSI_FAZA
@@ -58,10 +58,10 @@ MSI_FAZA=0
 IMENIK_ASKUPNO=C:\Inetpub\spletne-skripte\ASkupno
 !ENDIF
 
-!IF "$(MSI_PLATFORMA)" == "Win32"
+!IF "$(PLAT)" == "Win32"
 MSI_PLATFORMA2=Intel
 !ELSE
-MSI_PLATFORMA2=$(MSI_PLATFORMA)
+MSI_PLATFORMA2=$(PLAT)
 !ENDIF
 
 Vse ::
@@ -76,19 +76,19 @@ Pocisti ::
 ######################################################################
 
 Vse :: \
-	"$(MSI_IMENIK_MSM)\Verzija\Verzija.mak" \
-	"$(MSI_IMENIK_CILJ)\GUIDPaketa.mak"
+	"$(MSIBUILD_ROOT)\Verzija\Verzija.mak" \
+	"$(MSIBUILD_OUTPUT_DIR)\GUIDPaketa.mak"
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) MSI_FAZA=1 Vse
 
 Pocisti ::
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) MSI_FAZA=100 Pocisti
 
-"$(MSI_IMENIK_MSM)\Verzija\Verzija.mak" ::
+"$(MSIBUILD_ROOT)\Verzija\Verzija.mak" ::
 	cd $(@D)
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Verzija
 	cd "$(MAKEDIR)"
 	
-"$(MSI_IMENIK_CILJ)\GUIDPaketa.mak" ::
+"$(MSIBUILD_OUTPUT_DIR)\GUIDPaketa.mak" ::
 	-if exist $@ del /f /q $@
 	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
 	novguid.exe MSI_GUID_PAKETA | sed -e "s/set //i" >> "$(@:"=).tmp"
@@ -102,29 +102,29 @@ Pocisti ::
 #   namestitvenega paketa.
 ######################################################################
 
-!INCLUDE "$(MSI_IMENIK_MSM)\Verzija\Verzija.mak"
-!INCLUDE "$(MSI_IMENIK_CILJ)\GUIDPaketa.mak"
+!INCLUDE "$(MSIBUILD_ROOT)\Verzija\Verzija.mak"
+!INCLUDE "$(MSIBUILD_OUTPUT_DIR)\GUIDPaketa.mak"
 
 Vse :: \
-	"$(MSI_IMENIK_CILJ)\$(MSI_CILJ).1.msi" \
-	"$(MSI_IMENIK_CILJ)\$(MSI_CILJ).2.dep"
+	"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).1.msi" \
+	"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.dep"
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) MSI_FAZA=2 Vse
 
-"$(MSI_IMENIK_CILJ)\$(MSI_CILJ).1.msi" : $(MSI_MODULI) $(MSI_MODULI_DODATNI)
+"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).1.msi" : $(MSIBUILD_MODULES) $(MSIBUILD_MODULES_PRECOMPILED)
 	-if exist $@ del /f /q $@
-	copy /y "$(MSI_IMENIK_MSM)\Empty.msi" "$(@:"=).tmp" > NUL
+	copy /y "$(MSIBUILD_ROOT)\Empty.msi" "$(@:"=).tmp" > NUL
 	!if not exist "$(**R:"=).msmcfg" msidb.exe -d "$(@:"=).tmp" -m $**
-	msiinfo.exe "$(@:"=).tmp" /nologo /C $(MSI_KODNA_TABELA) /T "$(MSI_IME_IZDELKA) $(MSI_VERZIJA_STR) ($(MSI_PLATFORMA))" /J "$(MSI_OPIS_IZDELKA)" /A "$(MSI_AVTOR)" /P "$(MSI_PLATFORMA2);$(MSI_KODA_JEZIKA)" /G $(MSI_VERZIJA) /V $(MSI_GUID_PAKETA) /W 0 /O ""
-	!if exist "$(**R:"=).msmcfg" msimsm.exe "$(@:"=).tmp" $** /N "$(**R:"=).msmcfg" /D "$(**R:"=).log" /Sd "$(MSI_IMENIK_CILJ)" /F
+	msiinfo.exe "$(@:"=).tmp" /nologo /C $(MSIBUILD_CODEPAGE) /T "$(MSIBUILD_PRODUCT_NAME) $(MSI_VERZIJA_STR) ($(PLAT))" /J "$(MSIBUILD_PRODUCT_DESC)" /A "$(MSIBUILD_VENDOR_NAME)" /P "$(MSI_PLATFORMA2);$(MSIBUILD_LANGID)" /G $(MSIBUILD_MSI_VERSION_MIN) /V $(MSI_GUID_PAKETA) /W 0 /O ""
+	!if exist "$(**R:"=).msmcfg" msimsm.exe "$(@:"=).tmp" $** /N "$(**R:"=).msmcfg" /D "$(**R:"=).log" /Sd "$(MSIBUILD_OUTPUT_DIR)" /F
 	move /y "$(@:"=).tmp" $@ > NUL
 
-"$(MSI_IMENIK_CILJ)\$(MSI_CILJ).2.dep" : "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).1.msi"
+"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.dep" : "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).1.msi"
 	-if exist $@ del /f /q $@
 	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
-	cscript.exe "$(IMENIK_ASKUPNO)\MSI.wsf" //Job:NarediDEP //Nologo "$(@:"=).tmp" "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).2.msi" $**
+	cscript.exe "$(IMENIK_ASKUPNO)\MSI.wsf" //Job:NarediDEP //Nologo "$(@:"=).tmp" "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.msi" $**
 	move /y "$(@:"=).tmp" $@ > NUL
 
-$(MSI_MODULI) ::
+$(MSIBUILD_MODULES) ::
 	cd $(@D)
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) MSM_IMA_VERZIJO=1
 	cd "$(MAKEDIR)"
@@ -136,29 +136,29 @@ $(MSI_MODULI) ::
 # - Dopolnitev namestitvenega paketa z verzijami in dolžinami datotek.
 ######################################################################
 
-!INCLUDE "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).2.dep"
-!INCLUDE "$(MSI_IMENIK_MSM)\Verzija\Verzija.mak"
+!INCLUDE "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.dep"
+!INCLUDE "$(MSIBUILD_ROOT)\Verzija\Verzija.mak"
 
 Vse :: \
-!IFDEF MSI_STISNI
-	"$(MSI_IMENIK_CILJ)\$(MSI_CILJ).3.dep" \
+!IFDEF MSIBUILD_COMPRESS
+	"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.dep" \
 !ENDIF
-	"$(MSI_IMENIK_CILJ)\$(MSI_CILJ).2.msi"
-!IFDEF MSI_STISNI
+	"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.msi"
+!IFDEF MSIBUILD_COMPRESS
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) MSI_FAZA=3 Vse
 !ENDIF
 
-"$(MSI_IMENIK_CILJ)\$(MSI_CILJ).2.msi" : "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).1.msi"
+"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.msi" : "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).1.msi"
 	-if exist $@ del /f /q $@
 	-if exist "$(*:"=).out" del /f /q "$(*:"=).out"
-	copy /y "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).1.msi" "$(@:"=).tmp" > NUL
+	copy /y "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).1.msi" "$(@:"=).tmp" > NUL
 	msifiler.exe -v -h -d "$(@:"=).tmp" >> "$(*:"=).out"
 	move /y "$(@:"=).tmp" $@ > NUL
 
-"$(MSI_IMENIK_CILJ)\$(MSI_CILJ).3.dep" : "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).1.msi"
+"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.dep" : "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).1.msi"
 	-if exist $@ del /f /q $@
 	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
-	cscript.exe "$(IMENIK_ASKUPNO)\MSI.wsf" //Job:NarediDEP //Nologo "$(@:"=).tmp" "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).cab" $**
+	cscript.exe "$(IMENIK_ASKUPNO)\MSI.wsf" //Job:NarediDEP //Nologo "$(@:"=).tmp" "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).cab" $**
 	move /y "$(@:"=).tmp" $@ > NUL
 
 !ELSEIF $(MSI_FAZA) == 3
@@ -168,33 +168,33 @@ Vse :: \
 # - Kompresija namestitvenega paketa
 ######################################################################
 
-!INCLUDE "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).3.dep"
-!INCLUDE "$(MSI_IMENIK_MSM)\Verzija\Verzija.mak"
+!INCLUDE "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.dep"
+!INCLUDE "$(MSIBUILD_ROOT)\Verzija\Verzija.mak"
 
 Vse :: \
-	"$(MSI_IMENIK_CILJ)\$(MSI_CILJ).3.msi"
+	"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.msi"
 
-"$(MSI_IMENIK_CILJ)\$(MSI_CILJ).3.ddf" : "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).2.msi"
+"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.ddf" : "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.msi"
 	-if exist $@ del /f /q $@
 	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
-	cscript.exe "$(IMENIK_ASKUPNO)\MSI.wsf" //Job:NarediDDF //Nologo "$(@:"=).tmp" $** /O:"$(MSI_IMENIK_CILJ)\$(MSI_CILJ)" /K:LZX
+	cscript.exe "$(IMENIK_ASKUPNO)\MSI.wsf" //Job:NarediDDF //Nologo "$(@:"=).tmp" $** /O:"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET)" /K:LZX
 	move /y "$(@:"=).tmp" $@ > NUL
 
-"$(MSI_IMENIK_CILJ)\$(MSI_CILJ).cab" \
-"$(MSI_IMENIK_CILJ)\$(MSI_CILJ).inf" \
-"$(MSI_IMENIK_CILJ)\$(MSI_CILJ).rpt" : "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).3.ddf"
-	makecab.exe /F "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).3.ddf"
+"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).cab" \
+"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).inf" \
+"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).rpt" : "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.ddf"
+	makecab.exe /F "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.ddf"
 
-"$(MSI_IMENIK_CILJ)\$(MSI_CILJ).3.msi" : \
-	"$(MSI_IMENIK_CILJ)\$(MSI_CILJ).2.msi" \
-	"$(MSI_IMENIK_CILJ)\$(MSI_CILJ).cab" \
-	"$(MSI_IMENIK_CILJ)\$(MSI_CILJ).inf"
+"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.msi" : \
+	"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.msi" \
+	"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).cab" \
+	"$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).inf"
 	-if exist $@ del /f /q $@
-	copy /y "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).2.msi" "$(@:"=).tmp" > NUL
-	cscript.exe "$(IMENIK_ASKUPNO)\MSI.wsf" //Job:NastaviCAB //Nologo "$(@:"=).tmp" "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).inf" /V
+	copy /y "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.msi" "$(@:"=).tmp" > NUL
+	cscript.exe "$(IMENIK_ASKUPNO)\MSI.wsf" //Job:NastaviCAB //Nologo "$(@:"=).tmp" "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).inf" /V
 	msiinfo.exe "$(@:"=).tmp" /nologo /U 4
 !IFDEF MANIFESTCERTIFICATETHUMBPRINT
-	signcode.exe -i "$(MSI_URL_AVTORJA)" -sha1 "$(MANIFESTCERTIFICATETHUMBPRINT)" -t "$(MANIFESTTIMESTAMPURL)" -n "$(MSI_IME_IZDELKA)" "$(@:"=).tmp" > NUL
+	signcode.exe -i "$(MSIBUILD_VENDOR_URL)" -sha1 "$(MANIFESTCERTIFICATETHUMBPRINT)" -t "$(MANIFESTTIMESTAMPURL)" -n "$(MSIBUILD_PRODUCT_NAME)" "$(@:"=).tmp" > NUL
 !ENDIF
 	attrib.exe +r "$(@:"=).tmp"
 	move /y "$(@:"=).tmp" $@ > NUL
@@ -206,30 +206,30 @@ Vse :: \
 # - Čiščenje modulov
 ######################################################################
 
-Pocisti :: $(MSI_MODULI) $(MSI_MODULI_DODATNI)
-	cd "$(MSI_IMENIK_MSM)\Verzija"
+Pocisti :: $(MSIBUILD_MODULES) $(MSIBUILD_MODULES_PRECOMPILED)
+	cd "$(MSIBUILD_ROOT)\Verzija"
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Pocisti
 	cd "$(MAKEDIR)"
-	-if exist "$(MSI_IMENIK_CILJ)\GUIDPaketa.mak"    del /f /q "$(MSI_IMENIK_CILJ)\GUIDPaketa.mak"
-	-if exist "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).1.msi" del /f /q "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).1.msi"
-	-if exist "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).2.dep" del /f /q "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).2.dep"
-	-if exist "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).2.msi" del /f /q "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).2.msi"
-	-if exist "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).2.out" del /f /q "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).2.out"
-	-if exist "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).3.dep" del /f /q "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).3.dep"
-	-if exist "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).3.ddf" del /f /q "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).3.ddf"
-	-if exist "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).3.msi" del /f /q "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).3.msi"
-	-if exist "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).3.out" del /f /q "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).3.out"
-	-if exist "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).cab"   del /f /q "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).cab"
-	-if exist "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).inf"   del /f /q "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).inf"
-	-if exist "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).rpt"   del /f /q "$(MSI_IMENIK_CILJ)\$(MSI_CILJ).rpt"
+	-if exist "$(MSIBUILD_OUTPUT_DIR)\GUIDPaketa.mak"    del /f /q "$(MSIBUILD_OUTPUT_DIR)\GUIDPaketa.mak"
+	-if exist "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).1.msi" del /f /q "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).1.msi"
+	-if exist "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.dep" del /f /q "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.dep"
+	-if exist "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.msi" del /f /q "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.msi"
+	-if exist "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.out" del /f /q "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).2.out"
+	-if exist "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.dep" del /f /q "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.dep"
+	-if exist "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.ddf" del /f /q "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.ddf"
+	-if exist "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.msi" del /f /q "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.msi"
+	-if exist "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.out" del /f /q "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).3.out"
+	-if exist "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).cab"   del /f /q "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).cab"
+	-if exist "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).inf"   del /f /q "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).inf"
+	-if exist "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).rpt"   del /f /q "$(MSIBUILD_OUTPUT_DIR)\$(MSIBUILD_TARGET).rpt"
 
-$(MSI_MODULI) ::
+$(MSIBUILD_MODULES) ::
 	cd $(@D)
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Pocisti
 	cd "$(MAKEDIR)"
 
-!IFDEF MSI_MODULI_DODATNI
-$(MSI_MODULI_DODATNI) ::
+!IFDEF MSIBUILD_MODULES_PRECOMPILED
+$(MSIBUILD_MODULES_PRECOMPILED) ::
 	cd $(@D)
 	-if exist "*.log" del /f /q "*.log"
 	cd "$(MAKEDIR)"
diff --git a/UI/Makefile b/UI/Makefile
index e0fcfac..cc235f1 100644
--- a/UI/Makefile
+++ b/UI/Makefile
@@ -1,21 +1,21 @@
-!INCLUDE "..\..\..\include\MSINast.mak"
+!INCLUDE "..\..\..\include\MSIBuildCfg.mak"
 !IFDEF MSM_IMA_VERZIJO
 !INCLUDE "..\Verzija\Verzija.mak"
 !ENDIF
 
-MSM_IMA_LOKALIZACIJO=1
+MSIBUILD_IS_LOCALIZEABLE=1
 
 
 ######################################################################
 # AdminUISequence
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).AdminUISequence-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).AdminUISequence-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).AdminUISequence-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).AdminUISequence-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Action	Condition	Sequence
-s$(MSI_TIP_ID)	S255	I2
+s$(MSIBUILD_LENGTH_ID)	S255	I2
 AdminUISequence	Action
 dlgFailed		-3
 dlgUserExit		-2
@@ -38,18 +38,18 @@ ExecuteAction		1300
 # Binary
 
 Vse :: \
-	"$(JEZIK).$(CFG).$(PLAT).Binary-1" \
-	"$(JEZIK).$(CFG).$(PLAT).Binary-1\UIOpozorilo.ico" \
-	"$(JEZIK).$(CFG).$(PLAT).Binary-1\UIObvestilo.ico" \
-	"$(JEZIK).$(CFG).$(PLAT).Binary-1\UIMapaNova.ico" \
-	"$(JEZIK).$(CFG).$(PLAT).Binary-1\UIMapaGor.ico" \
-	"$(JEZIK).$(CFG).$(PLAT).Binary-1.idt"
+	"$(LANG).$(CFG).$(PLAT).Binary-1" \
+	"$(LANG).$(CFG).$(PLAT).Binary-1\UIOpozorilo.ico" \
+	"$(LANG).$(CFG).$(PLAT).Binary-1\UIObvestilo.ico" \
+	"$(LANG).$(CFG).$(PLAT).Binary-1\UIMapaNova.ico" \
+	"$(LANG).$(CFG).$(PLAT).Binary-1\UIMapaGor.ico" \
+	"$(LANG).$(CFG).$(PLAT).Binary-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).Binary-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).Binary-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Name	Data
-s$(MSI_TIP_ID)	v0
+s$(MSIBUILD_LENGTH_ID)	v0
 Binary	Name
 binUIOpozorilo.ico	UIOpozorilo.ico
 binUIObvestilo.ico	UIObvestilo.ico
@@ -57,29 +57,29 @@ binUIMapaNova.ico	UIMapaNova.ico
 binUIMapaGor.ico	UIMapaGor.ico
 <<NOKEEP
 
-"$(JEZIK).$(CFG).$(PLAT).Binary-1\UIOpozorilo.ico" : "Binary\UIOpozorilo.ico"
+"$(LANG).$(CFG).$(PLAT).Binary-1\UIOpozorilo.ico" : "Binary\UIOpozorilo.ico"
 	copy /y $** $@ > NUL
 
-"$(JEZIK).$(CFG).$(PLAT).Binary-1\UIObvestilo.ico" : "Binary\UIObvestilo.ico"
+"$(LANG).$(CFG).$(PLAT).Binary-1\UIObvestilo.ico" : "Binary\UIObvestilo.ico"
 	copy /y $** $@ > NUL
 
-"$(JEZIK).$(CFG).$(PLAT).Binary-1\UIMapaNova.ico" : "Binary\UIMapaNova.ico"
+"$(LANG).$(CFG).$(PLAT).Binary-1\UIMapaNova.ico" : "Binary\UIMapaNova.ico"
 	copy /y $** $@ > NUL
 
-"$(JEZIK).$(CFG).$(PLAT).Binary-1\UIMapaGor.ico" : "Binary\UIMapaGor.ico"
+"$(LANG).$(CFG).$(PLAT).Binary-1\UIMapaGor.ico" : "Binary\UIMapaGor.ico"
 	copy /y $** $@ > NUL
 
 
 ######################################################################
 # CheckBox
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).CheckBox-2.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).CheckBox-2.idt"
 
-"Sl.$(CFG).$(PLAT).CheckBox-2.idtx" : "Makefile" "..\..\..\include\MSINast.mak"
+"Sl.$(CFG).$(PLAT).CheckBox-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Property	Value
-s$(MSI_TIP_ID)	S64
+s$(MSIBUILD_LENGTH_ID)	S64
 1250	CheckBox	Property
 <<NOKEEP
 
@@ -99,13 +99,13 @@ s$(MSI_TIP_ID)	S64
 ######################################################################
 # Control
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).Control-2.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).Control-2.idt"
 
-"Sl.$(CFG).$(PLAT).Control-2.idtx" : "Makefile" "..\..\..\include\MSINast.mak"
+"Sl.$(CFG).$(PLAT).Control-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Dialog_	Control	Type	X	Y	Width	Height	Attributes	Property	Text	Control_Next	Help
-s$(MSI_TIP_ID)	s50	s20	i2	i2	i2	i2	I4	S50	L0	S50	L$(MSI_TIP_POMOC)
+s$(MSIBUILD_LENGTH_ID)	s50	s20	i2	i2	i2	i2	I4	S50	L0	S50	L$(MSIBUILD_LENGTH_HELP)
 1250	Control	Dialog_	Control
 dlgPrepare	ctlBannerBitmap	Bitmap	0	0	400	45	1		binUIGlava.bmp	ctlTitle	
 dlgPrepare	ctlTitle	Text	15	15	320	15	196611		[DlgTitleFont]Namestitev programa [SimpleProductName] se pripravlja. Prosimo, počakajte ...	ctlProgressBar	
@@ -119,7 +119,7 @@ dlgTypeSetup	ctlBannerBitmap	Bitmap	0	0	400	45	1		binUIGlava.bmp	ctlTitle
 dlgTypeSetup	ctlTitle	Text	15	15	320	15	196611		[DlgTitleFont]Izberite vrsto namestitve.	ctlInstall	
 dlgTypeSetup	ctlInstall	PushButton	140	130	120	40	3		[DlgTitleFont][ButtonTextInstall] 	ctlCustomize	Namesti najbolj običajne dele programa. Primerno za večino uporabnikov.|
 dlgTypeSetup	ctlCustomize	PushButton	165	190	70	25	3		Po &meri	ctlBannerBitmap	Omogoča, da sami izberete, kateri deli bodo nameščeni in kam.|
-!IFDEF MSI_IMA_TUDI_X64
+!IFDEF MSIBUILD_HAS_X64
 !IF "$(PLAT)" == "Win32"
 dlgTypeSetup	ctlWoW64Icon	Icon	15	234	24	24	5242880		binUIOpozorilo.ico		Opozorilo|
 dlgTypeSetup	ctlWoW64Label	Text	44	234	341	15	196610		[DlgStrongFont]Namestili boste 32-bitno različico na 64-bitni operacijski sistem.		
@@ -248,17 +248,17 @@ dlgFailed	ctlClose	PushButton	325	265	60	20	3		&Zapri	ctlBannerBitmap
 ######################################################################
 # ControlCondition
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).ControlCondition-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).ControlCondition-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).ControlCondition-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).ControlCondition-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Dialog_	Control_	Action	Condition
-s$(MSI_TIP_ID)	s50	s50	s255
+s$(MSIBUILD_LENGTH_ID)	s50	s50	s255
 ControlCondition	Dialog_	Control_	Action	Condition
 dlgLicenseAgreement	ctlContinue	Disable	NOT IAgree
 dlgLicenseAgreement	ctlContinue	Enable	IAgree
-!IFDEF MSI_IMA_TUDI_X64
+!IFDEF MSIBUILD_HAS_X64
 !IF "$(PLAT)" == "Win32"
 dlgTypeSetup	ctlWoW64Icon	Show	VersionNT64
 dlgTypeSetup	ctlWoW64Label	Show	VersionNT64
@@ -275,14 +275,14 @@ dlgCustomize	ctlBrowse	Disable	Installed
 # ControlEvent
 
 Vse :: \
-	"$(JEZIK).$(CFG).$(PLAT).ControlEvent-1.idt" \
-	"$(JEZIK).$(CFG).$(PLAT).ControlEvent-2.idt"
+	"$(LANG).$(CFG).$(PLAT).ControlEvent-1.idt" \
+	"$(LANG).$(CFG).$(PLAT).ControlEvent-2.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).ControlEvent-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).ControlEvent-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Dialog_	Control_	Event	Argument	Condition	Ordering
-s$(MSI_TIP_ID)	s50	s50	s255	S255	I2
+s$(MSIBUILD_LENGTH_ID)	s50	s50	s255	S255	I2
 ControlEvent	Dialog_	Control_	Event	Argument	Condition
 dlgPrepare	ctlBannerBitmap	SpawnDialog	dlgCancel	1	1000
 dlgLicenseAgreement	ctlBannerBitmap	SpawnDialog	dlgCancel	1	1000
@@ -374,11 +374,11 @@ dlgUserExit	ctlClose	EndDialog	Exit	1	1000
 dlgFailed	ctlClose	EndDialog	Exit	1	1000
 <<NOKEEP
 
-"Sl.$(CFG).$(PLAT).ControlEvent-2.idtx" : "Makefile" "..\..\..\include\MSINast.mak"
+"Sl.$(CFG).$(PLAT).ControlEvent-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Dialog_	Control_	Event	Argument	Condition	Ordering
-s$(MSI_TIP_ID)	s50	s50	s255	S255	I2
+s$(MSIBUILD_LENGTH_ID)	s50	s50	s255	S255	I2
 1250	ControlEvent	Dialog_	Control_	Event	Argument	Condition
 dlgLicenseAgreement	ctlContinue	[WaitMessage]	Ugotavljanje potrebnega prostora za namestitev ...	1	99
 dlgResume	ctlContinue	[WaitMessage]	Ugotavljanje potrebnega prostora za namestitev ...	1	99
@@ -408,13 +408,13 @@ dlgTypeMaintenance	ctlContinue	[Progress2]	Odstranitev	InstallMode="Remove"	507
 ######################################################################
 # CustomAction
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).CustomAction-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).CustomAction-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).CustomAction-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).CustomAction-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Action	Type	Source	Target
-s$(MSI_TIP_ID)	i2	S$(MSI_TIP_ID)	S255
+s$(MSIBUILD_LENGTH_ID)	i2	S$(MSIBUILD_LENGTH_ID)	S255
 CustomAction	Action
 caSetDefaultUIFontVista	51	DefaultUIFont	tsDlgVista
 caSetDlgStrongFontVista	51	DlgStrongFont	{\tsStrongVista}
@@ -427,14 +427,14 @@ caSetInstallModeAdmin	51	InstallMode	Server Image
 # Dialog
 
 Vse :: \
-	"$(JEZIK).$(CFG).$(PLAT).Dialog-1.idt" \
-	"$(JEZIK).$(CFG).$(PLAT).Dialog-2.idt"
+	"$(LANG).$(CFG).$(PLAT).Dialog-1.idt" \
+	"$(LANG).$(CFG).$(PLAT).Dialog-2.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).Dialog-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).Dialog-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Dialog	HCentering	VCentering	Width	Height	Attributes	Title	Control_First	Control_Default	Control_Cancel
-s$(MSI_TIP_ID)	i2	i2	i2	i2	I4	L128	s50	S50	S50
+s$(MSIBUILD_LENGTH_ID)	i2	i2	i2	i2	I4	L128	s50	S50	S50
 Dialog	Dialog
 dlgPrepare	50	50	400	300	1	[Setup] [SimpleProductName] [DisplayVersion]	ctlTitle	ctlBannerBitmap	ctlBannerBitmap
 dlgLicenseAgreement	50	50	400	300	3	[Setup] [SimpleProductName] [DisplayVersion]	ctlTitle	ctlContinue	ctlBannerBitmap
@@ -457,11 +457,11 @@ dlgUserExit	50	50	400	300	3	[Setup] [SimpleProductName] [DisplayVersion]	ctlTitl
 dlgFailed	50	50	400	300	3	[Setup] [SimpleProductName] [DisplayVersion]	ctlTitle	ctlClose	ctlClose
 <<NOKEEP
 
-"Sl.$(CFG).$(PLAT).Dialog-2.idtx" : "Makefile" "..\..\..\include\MSINast.mak"
+"Sl.$(CFG).$(PLAT).Dialog-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Dialog	HCentering	VCentering	Width	Height	Attributes	Title	Control_First	Control_Default	Control_Cancel
-s$(MSI_TIP_ID)	i2	i2	i2	i2	I4	L128	s50	S50	S50
+s$(MSIBUILD_LENGTH_ID)	i2	i2	i2	i2	I4	L128	s50	S50	S50
 1250	Dialog	Dialog
 dlgError	50	50	260	120	65539	Napaka	ErrorText		
 <<NOKEEP
@@ -482,13 +482,13 @@ dlgError	50	50	260	120	65539	Napaka	ErrorText
 ######################################################################
 # EventMapping
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).EventMapping-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).EventMapping-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).EventMapping-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).EventMapping-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Dialog_	Control_	Event	Attribute
-s$(MSI_TIP_ID)	s50	s50	s50
+s$(MSIBUILD_LENGTH_ID)	s50	s50	s50
 EventMapping	Dialog_	Control_	Event
 dlgPrepare	ctlActionText	ActionText	Text
 dlgPrepare	ctlProgressBar	SetProgress	Progress
@@ -510,13 +510,13 @@ dlgBrowseAdmin	ctlDirectoryCombo	IgnoreChange	IgnoreChange
 ######################################################################
 # InstallUISequence
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).InstallUISequence-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).InstallUISequence-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).InstallUISequence-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).InstallUISequence-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Action	Condition	Sequence
-s$(MSI_TIP_ID)	S255	I2
+s$(MSIBUILD_LENGTH_ID)	S255	I2
 InstallUISequence	Action
 dlgFailed		-3
 dlgUserExit		-2
@@ -537,14 +537,14 @@ dlgProgress		1280
 # Property
 
 Vse :: \
-	"$(JEZIK).$(CFG).$(PLAT).Property-1.idt" \
-	"$(JEZIK).$(CFG).$(PLAT).Property-2.idt"
+	"$(LANG).$(CFG).$(PLAT).Property-1.idt" \
+	"$(LANG).$(CFG).$(PLAT).Property-2.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).Property-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).Property-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Property	Value
-s$(MSI_TIP_ID)	l0
+s$(MSIBUILD_LENGTH_ID)	l0
 Property	Property
 DefaultUIFont	tsDlgXP
 DlgStrongFont	{\tsStrongXP}
@@ -553,11 +553,11 @@ ErrorDialog	dlgError
 InstallModeRB	Change
 <<NOKEEP
 
-"Sl.$(CFG).$(PLAT).Property-2.idtx" : "Makefile" "..\..\..\include\MSINast.mak"
+"Sl.$(CFG).$(PLAT).Property-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Property	Value
-s$(MSI_TIP_ID)	l0
+s$(MSIBUILD_LENGTH_ID)	l0
 1250	Property	Property
 Progress1	Nameščam
 Progress2	Namestitev
@@ -583,13 +583,13 @@ ButtonTextInstall	&Namesti zdaj
 ######################################################################
 # RadioButton
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).RadioButton-2.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).RadioButton-2.idt"
 
-"Sl.$(CFG).$(PLAT).RadioButton-2.idtx" : "Makefile" "..\..\..\include\MSINast.mak"
+"Sl.$(CFG).$(PLAT).RadioButton-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Property	Order	Value	X	Y	Width	Height	Text	Help
-s$(MSI_TIP_ID)	i2	s64	i2	i2	i2	i2	L64	L$(MSI_TIP_POMOC)
+s$(MSIBUILD_LENGTH_ID)	i2	s64	i2	i2	i2	i2	L64	L$(MSIBUILD_LENGTH_HELP)
 1250	RadioButton	Property	Order
 InstallModeRB	1	Change	0	0	370	15	&Spremeni	Omogoča, da sami izberete, kateri deli programa so nameščeni.|
 InstallModeRB	2	Repair	0	20	370	15	Ob&novi	Odpravi napake pri namestitvi programa - popravi pokvarjene ali manjkajoče datoteke, bližnjice in zapise v registru.|
@@ -612,13 +612,13 @@ InstallModeRB	3	Remove	0	40	370	15	&Odstrani	Odstrani program z va
 ######################################################################
 # TextStyle
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).TextStyle-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).TextStyle-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).TextStyle-1.idt" : "Makefile" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).TextStyle-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 TextStyle	FaceName	Size	Color	StyleBits
-s$(MSI_TIP_ID)	s32	i2	I4	I2
+s$(MSIBUILD_LENGTH_ID)	s32	i2	I4	I2
 TextStyle	TextStyle
 tsDlgXP	Tahoma	8		0
 tsStrongXP	Tahoma	8		1
diff --git a/Verzija/Makefile b/Verzija/Makefile
index db74279..b242ee6 100644
--- a/Verzija/Makefile
+++ b/Verzija/Makefile
@@ -1,7 +1,7 @@
-!INCLUDE "..\..\..\include\MSINast.mak"
+!INCLUDE "..\..\..\include\MSIBuildCfg.mak"
 
-!IFNDEF DATOTEKA_KONST
-!ERROR Spremenljivka DATOTEKA_KONST ni definirana!
+!IFNDEF MSIBUILD_VERSION_FILE
+!ERROR Spremenljivka MSIBUILD_VERSION_FILE ni definirana!
 !ENDIF
 
 Vse ::
@@ -21,13 +21,13 @@ Vse :: "Verzija.mak"
 
 Verzija :: "Verzija.mak"
 
-"Verzija.mak" : "$(DATOTEKA_KONST)"
+"Verzija.mak" : "$(MSIBUILD_VERSION_FILE)"
 	-if exist $@ del /f /q $@
 	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
-	grep.exe -e "#define[[:space:]]*.*_VERZIJA[[:space:]]*0x"   "$(DATOTEKA_KONST)" | sed.exe -e "s/.*0x\(.*\)/MSI_VERZIJA_INT=\1/g"            >> "$(@:"=).tmp"
-	grep.exe -e "#define[[:space:]]*.*_VERZIJA_STR[[:space:]]"  "$(DATOTEKA_KONST)" | sed.exe -e "s/[^\"]*\"\([^\"]*\)\"/MSI_VERZIJA_STR=\1/g"  >> "$(@:"=).tmp"
-	grep.exe -e "#define[[:space:]]*.*_VERZIJA_INST[[:space:]]" "$(DATOTEKA_KONST)" | sed.exe -e "s/[^\"]*\"\([^\"]*\)\"/MSI_VERZIJA_INST=\1/g" >> "$(@:"=).tmp"
-	grep.exe -e "#define[[:space:]]*.*_VERZIJA_GUID[[:space:]]" "$(DATOTEKA_KONST)" | sed.exe -e "s/[^\"]*\"\([^\"]*\)\"/MSI_VERZIJA_GUID=\1/g" >> "$(@:"=).tmp"
+	grep.exe -e "#define[[:space:]]*.*_VERZIJA[[:space:]]*0x"   "$(MSIBUILD_VERSION_FILE)" | sed.exe -e "s/.*0x\(.*\)/MSI_VERZIJA_INT=\1/g"            >> "$(@:"=).tmp"
+	grep.exe -e "#define[[:space:]]*.*_VERZIJA_STR[[:space:]]"  "$(MSIBUILD_VERSION_FILE)" | sed.exe -e "s/[^\"]*\"\([^\"]*\)\"/MSI_VERZIJA_STR=\1/g"  >> "$(@:"=).tmp"
+	grep.exe -e "#define[[:space:]]*.*_VERZIJA_INST[[:space:]]" "$(MSIBUILD_VERSION_FILE)" | sed.exe -e "s/[^\"]*\"\([^\"]*\)\"/MSI_VERZIJA_INST=\1/g" >> "$(@:"=).tmp"
+	grep.exe -e "#define[[:space:]]*.*_VERZIJA_GUID[[:space:]]" "$(MSIBUILD_VERSION_FILE)" | sed.exe -e "s/[^\"]*\"\([^\"]*\)\"/MSI_VERZIJA_GUID=\1/g" >> "$(@:"=).tmp"
 	move /y "$(@:"=).tmp" $@ > NUL
 
 !ELSE
@@ -39,8 +39,8 @@ Verzija :: "Verzija.mak"
 
 !INCLUDE "Verzija.mak"
 
-!IFNDEF MSI_GUID_UP
-!ERROR Spremenljivka MSI_GUID_UP ni definirana!
+!IFNDEF MSIBUILD_UPGRADE_GUID
+!ERROR Spremenljivka MSIBUILD_UPGRADE_GUID ni definirana!
 !ENDIF
 
 !IFNDEF MSI_VERZIJA_INST
@@ -59,34 +59,34 @@ Verzija :: "Verzija.mak"
 ######################################################################
 # Property
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).Property-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).Property-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).Property-1.idt" : "Makefile" "Verzija.mak" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).Property-1.idt" : "Makefile" "Verzija.mak" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Property	Value
-s$(MSI_TIP_ID)	l0
+s$(MSIBUILD_LENGTH_ID)	l0
 Property	Property
 ProductVersion	$(MSI_VERZIJA_INST)
 DisplayVersion	$(MSI_VERZIJA_STR)
 ProductCode	$(MSI_VERZIJA_GUID)
-UpgradeCode	$(MSI_GUID_UP)
+UpgradeCode	$(MSIBUILD_UPGRADE_GUID)
 <<NOKEEP
 
 
 ######################################################################
 # Upgrade
 
-Vse :: "$(JEZIK).$(CFG).$(PLAT).Upgrade-1.idt"
+Vse :: "$(LANG).$(CFG).$(PLAT).Upgrade-1.idt"
 
-"$(JEZIK).$(CFG).$(PLAT).Upgrade-1.idt" : "Makefile" "Verzija.mak" "..\..\..\include\MSINast.mak"
+"$(LANG).$(CFG).$(PLAT).Upgrade-1.idt" : "Makefile" "Verzija.mak" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 UpgradeCode	VersionMin	VersionMax	Language	Attributes	Remove	ActionProperty
-s38	S20	S20	S255	i4	S255	s$(MSI_TIP_ID)
+s38	S20	S20	S255	i4	S255	s$(MSIBUILD_LENGTH_ID)
 Upgrade	UpgradeCode	VersionMin	VersionMax	Language	Attributes
-$(MSI_GUID_UP)	0			257		OLDPRODUCTFOUND
-$(MSI_GUID_UP)	$(MSI_VERZIJA_INST)			2		NEWPRODUCTFOUND
+$(MSIBUILD_UPGRADE_GUID)	0			257		OLDPRODUCTFOUND
+$(MSIBUILD_UPGRADE_GUID)	$(MSI_VERZIJA_INST)			2		NEWPRODUCTFOUND
 <<NOKEEP
 
 !ENDIF