diff --git a/desmume/src/GPU.cpp b/desmume/src/GPU.cpp
index 678134bcd..99aa1a4ce 100644
--- a/desmume/src/GPU.cpp
+++ b/desmume/src/GPU.cpp
@@ -861,9 +861,9 @@ void GPU_setBGProp(GPU * gpu, u16 num, u16 p)
 	} 
 	else 
 	{
-		gpu->BG_tile_ram[num] = ARM9MEM_ABG +  dispCnt->CharacBase_Block * ADDRESS_STEP_64kB ;
+		gpu->BG_tile_ram[num] = ARM9MEM_ABG +  dispCnt->CharacBase_Block * ADDRESS_STEP_64KB ;
 		gpu->BG_bmp_ram[num]  = ARM9MEM_ABG;
-		gpu->BG_map_ram[num]  = ARM9MEM_ABG +  dispCnt->ScreenBase_Block * ADDRESS_STEP_64kB;
+		gpu->BG_map_ram[num]  = ARM9MEM_ABG +  dispCnt->ScreenBase_Block * ADDRESS_STEP_64KB;
 	}
 
 	gpu->BG_tile_ram[num] += (cnt->CharacBase_Block * ADDRESS_STEP_16KB);
diff --git a/desmume/src/GPU.h b/desmume/src/GPU.h
index 019d3d3fe..8a1bd1a87 100644
--- a/desmume/src/GPU.h
+++ b/desmume/src/GPU.h
@@ -402,7 +402,7 @@ void register_gl_fun(fun_gl_Begin beg,fun_gl_End end);
 #define ADDRESS_STEP_8KB		0x02000
 #define ADDRESS_STEP_16KB	   0x04000
 #define ADDRESS_STEP_32KB	   0x08000
-#define ADDRESS_STEP_64kB	   0x10000
+#define ADDRESS_STEP_64KB	   0x10000
 #define ADDRESS_STEP_128KB	   0x20000
 #define ADDRESS_STEP_256KB	   0x40000
 #define ADDRESS_STEP_512KB	   0x80000