diff --git a/core/ASLR/HASH-API.asm b/core/ASLR/block_api.asm
similarity index 100%
rename from core/ASLR/HASH-API.asm
rename to core/ASLR/block_api.asm
diff --git a/core/ASLR/iat/Relocate.asm b/core/ASLR/iat/relocate.asm
similarity index 100%
rename from core/ASLR/iat/Relocate.asm
rename to core/ASLR/iat/relocate.asm
diff --git a/core/ASLR/iat/Stub.asm b/core/ASLR/iat/stub.asm
similarity index 97%
rename from core/ASLR/iat/Stub.asm
rename to core/ASLR/iat/stub.asm
index 5f2e2cb..43adb67 100644
--- a/core/ASLR/iat/Stub.asm
+++ b/core/ASLR/iat/stub.asm
@@ -34,7 +34,7 @@ IAT_API:					;
 	jz OpEnd				; If VirtualAlloc fails don't bother :/	
 	push eax				; Save the new base address to stack
 	call GetAOE				; Get the AOE and image base 	
-	%include "Relocate.asm"	; Make image base relocation
+	%include "relocate.asm"	; Make image base relocation
 	%include "BuildImportTable.asm"	; Call the module responsible for building the import address table
 	xor ecx,ecx 			; Zero out the ECX
 	call GetAOE				; Get image base and AOE
diff --git a/core/ASLR/Relocate.asm b/core/ASLR/relocate.asm
similarity index 100%
rename from core/ASLR/Relocate.asm
rename to core/ASLR/relocate.asm
diff --git a/core/ASLR/Stub.asm b/core/ASLR/stub.asm
similarity index 96%
rename from core/ASLR/Stub.asm
rename to core/ASLR/stub.asm
index 98d289d..935ae31 100644
--- a/core/ASLR/Stub.asm
+++ b/core/ASLR/stub.asm
@@ -17,7 +17,7 @@
 
 	cld							; Clear out direction flags
 	call Start					; Start OP
-	%include "HASH-API.asm"		; hash_api
+	%include "block_api.asm"	; block_api
 GetAOE:
 	mov eax,[esi+0x3C]			; Get the offset of "PE" to eax
 	mov ebx,[eax+esi+0x34]		; Get the image base address to ebx
@@ -42,7 +42,7 @@ Stub:
 	jz OpEnd					; If VirtualAlloc fails don't bother :/	
 	push eax					; Save the new base address to stack
 	call GetAOE					; Get the AOE and image base 	
-	%include "Relocate.asm"		; Make image base relocation
+	%include "relocate.asm"		; Make image base relocation
 	%include "BuildImportTable.asm"	; Call the module responsible for building the import address table
 	xor ecx,ecx 				; Zero out the ECX
 	call GetAOE					; Get image base and AOE
diff --git a/core/Fixed/HASH-API.asm b/core/Fixed/block_api.asm
similarity index 100%
rename from core/Fixed/HASH-API.asm
rename to core/Fixed/block_api.asm
diff --git a/core/Fixed/iat/Stub.asm b/core/Fixed/iat/stub.asm
similarity index 100%
rename from core/Fixed/iat/Stub.asm
rename to core/Fixed/iat/stub.asm
diff --git a/core/Fixed/Stub.asm b/core/Fixed/stub.asm
similarity index 98%
rename from core/Fixed/Stub.asm
rename to core/Fixed/stub.asm
index fd8273e..c6eb8a5 100644
--- a/core/Fixed/Stub.asm
+++ b/core/Fixed/stub.asm
@@ -9,7 +9,7 @@
 
 	cld
 	call Start
-	%include "HASH-API.asm"
+	%include "block_api.asm"
 GetAOE:
 	mov eax,[esi+0x3C]			; Get the offset of "PE" to eax
 	mov ebx,[eax+esi+0x34]		; Get the image base address to ebx
diff --git a/src/assemble.go b/src/assemble.go
index a7c4f15..1cab380 100644
--- a/src/assemble.go
+++ b/src/assemble.go
@@ -30,7 +30,7 @@ func assemble() {
 			Cdir("/usr/share/Amber/core/Fixed/iat")		
 		}
 		progress()
-		nasm, Err := exec.Command("nasm","-f","bin","Stub.asm","-o","/usr/share/Amber/Payload").Output()
+		nasm, Err := exec.Command("nasm","-f","bin","stub.asm","-o","/usr/share/Amber/Payload").Output()
 		ParseError(Err,"While assembling payload :(",string(nasm))
 		progress()
 	} else {
@@ -45,7 +45,7 @@ func assemble() {
 			Cdir("/usr/share/Amber/core/ASLR/iat/")
 		}
 		progress()
-		nasm, Err := exec.Command("nasm","-f","bin","Stub.asm","-o","/usr/share/Amber/Payload").Output()
+		nasm, Err := exec.Command("nasm","-f","bin","stub.asm","-o","/usr/share/Amber/Payload").Output()
 		ParseError(Err,"While assembling payload :(",string(nasm))
 		progress()
 	}