diff --git a/software/common/scripts/cmsdk_bootloader.ld b/software/common/scripts/cmsdk_bootloader.ld
index bc1fd29cb8c7e487deb3b2b5e053a8e1084d6632..155a8dca6f2bc19aaf2b0e5994b1825edb4d0ba4 100644
--- a/software/common/scripts/cmsdk_bootloader.ld
+++ b/software/common/scripts/cmsdk_bootloader.ld
@@ -33,8 +33,8 @@ INCLUDE "lib-nosys.ld"
 
 MEMORY
 {
-  FLASH (rx) : ORIGIN = 0x01000000, LENGTH =  0x1000 /*  4K */
-  RAM (rwx)  : ORIGIN = 0x20000000, LENGTH = 0x10000 /* 64K */
+  FLASH (rx) : ORIGIN = 0x10000000, LENGTH =  0x1000 /*  4K */
+  RAM (rwx)  : ORIGIN = 0x30000000, LENGTH = 0x3C00 /* 15K */
 }
 
 INCLUDE "sections.ld"
diff --git a/software/common/scripts/cmsdk_cm0.ld b/software/common/scripts/cmsdk_cm0.ld
index 2ac111b4c1e84f0ed56d09852a63a0d9bbe2e9b7..c5da2af4e92190d3db3e38856b8094fd754ae3c0 100644
--- a/software/common/scripts/cmsdk_cm0.ld
+++ b/software/common/scripts/cmsdk_cm0.ld
@@ -34,7 +34,7 @@ INCLUDE "lib-nosys.ld"
 MEMORY
 {
   FLASH (rx) : ORIGIN = 0x0,        LENGTH = 0x10000 /* 64K */
-  RAM (rwx)  : ORIGIN = 0x20000000, LENGTH = 0xFC00  /* 63K */
+  RAM (rwx)  : ORIGIN = 0x30000000, LENGTH = 0x3C00  /* 15K */
   /* 64K is available, but reserve some space for    */
   /*   1) debug tester communication for debug tests */
   /*   2) DMA data structure for DMA tests           */
diff --git a/testcodes/aes128_tests/aes128_tests.c b/testcodes/aes128_tests/aes128_tests.c
index 3dbccadfc9d7cd668f4eabbe1bd18a84fcdaec6b..36bc54900904cd499bb5b92a8bfd15ec7568479f 100644
--- a/testcodes/aes128_tests/aes128_tests.c
+++ b/testcodes/aes128_tests/aes128_tests.c
@@ -440,7 +440,7 @@ void aes128_decrypt_dma(uint8_t *key, uint32_t nbytes, uint8_t *input, uint8_t *
 
 
 int main(void) {
-	char rx_char [256] = "soclabs AES128v1"; // init to 0
+	char rx_char [256] = "SoCLabs AES128v1"; // init to 0
 	unsigned char id_string [16] = {0};
 	int  i, fail=0;
         unsigned char * p;