diff --git a/src/test/ref/call-banked-phi-case-2-close-0.cfg b/src/test/ref/call-banked-phi-case-2-close-0.cfg
index 1701ea88d..47114a8a3 100644
--- a/src/test/ref/call-banked-phi-case-2-close-0.cfg
+++ b/src/test/ref/call-banked-phi-case-2-close-0.cfg
@@ -11,7 +11,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   to:plus::@return
diff --git a/src/test/ref/call-banked-phi-case-2-close-0.log b/src/test/ref/call-banked-phi-case-2-close-0.log
index 3f5fa068e..578d2ed25 100644
--- a/src/test/ref/call-banked-phi-case-2-close-0.log
+++ b/src/test/ref/call-banked-phi-case-2-close-0.log
@@ -18,7 +18,7 @@ main::@return: scope:[main]  from main::@1
   return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   plus::b#1 = phi( main/plus::b#0 )
   plus::a#1 = phi( main/plus::a#0 )
@@ -46,7 +46,7 @@ __constant char * const SCREEN = (char *)$400
 void __start()
 void main()
 char main::$0
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::$0
 char plus::a
 char plus::a#0
@@ -125,7 +125,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   to:plus::@return
@@ -136,7 +136,7 @@ plus::@return: scope:[plus]  from plus
 
 VARIABLE REGISTER WEIGHTS
 void main()
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 char plus::b
 char plus::return
@@ -229,7 +229,7 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 FINAL SYMBOL TABLE
 __constant char * const SCREEN = (char *) 1024
 void main()
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b
diff --git a/src/test/ref/call-banked-phi-case-2-close-0.sym b/src/test/ref/call-banked-phi-case-2-close-0.sym
index c79872a57..45d8d7108 100644
--- a/src/test/ref/call-banked-phi-case-2-close-0.sym
+++ b/src/test/ref/call-banked-phi-case-2-close-0.sym
@@ -1,6 +1,6 @@
 __constant char * const SCREEN = (char *) 1024
 void main()
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b
diff --git a/src/test/ref/call-banked-phi-case-2-close-1.cfg b/src/test/ref/call-banked-phi-case-2-close-1.cfg
index 1701ea88d..47114a8a3 100644
--- a/src/test/ref/call-banked-phi-case-2-close-1.cfg
+++ b/src/test/ref/call-banked-phi-case-2-close-1.cfg
@@ -11,7 +11,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   to:plus::@return
diff --git a/src/test/ref/call-banked-phi-case-2-close-1.log b/src/test/ref/call-banked-phi-case-2-close-1.log
index 60a66095a..2fa89f425 100644
--- a/src/test/ref/call-banked-phi-case-2-close-1.log
+++ b/src/test/ref/call-banked-phi-case-2-close-1.log
@@ -18,7 +18,7 @@ main::@return: scope:[main]  from main::@1
   return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   plus::b#1 = phi( main/plus::b#0 )
   plus::a#1 = phi( main/plus::a#0 )
@@ -46,7 +46,7 @@ __constant char * const SCREEN = (char *)$400
 void __start()
 void main()
 char main::$0
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::$0
 char plus::a
 char plus::a#0
@@ -125,7 +125,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   to:plus::@return
@@ -136,7 +136,7 @@ plus::@return: scope:[plus]  from plus
 
 VARIABLE REGISTER WEIGHTS
 void main()
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 char plus::b
 char plus::return
@@ -229,7 +229,7 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 FINAL SYMBOL TABLE
 __constant char * const SCREEN = (char *) 1024
 void main()
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b
diff --git a/src/test/ref/call-banked-phi-case-2-close-1.sym b/src/test/ref/call-banked-phi-case-2-close-1.sym
index c79872a57..45d8d7108 100644
--- a/src/test/ref/call-banked-phi-case-2-close-1.sym
+++ b/src/test/ref/call-banked-phi-case-2-close-1.sym
@@ -1,6 +1,6 @@
 __constant char * const SCREEN = (char *) 1024
 void main()
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b
diff --git a/src/test/ref/call-banked-phi-case-3-near-0.cfg b/src/test/ref/call-banked-phi-case-3-near-0.cfg
index abba7b99a..4a0b60f9d 100644
--- a/src/test/ref/call-banked-phi-case-3-near-0.cfg
+++ b/src/test/ref/call-banked-phi-case-3-near-0.cfg
@@ -11,7 +11,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   [5] call min
diff --git a/src/test/ref/call-banked-phi-case-3-near-0.log b/src/test/ref/call-banked-phi-case-3-near-0.log
index 5b3a50214..c0e438f84 100644
--- a/src/test/ref/call-banked-phi-case-3-near-0.log
+++ b/src/test/ref/call-banked-phi-case-3-near-0.log
@@ -18,7 +18,7 @@ main::@return: scope:[main]  from main::@1
   return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   plus::b#1 = phi( main/plus::b#0 )
   plus::a#1 = phi( main/plus::a#0 )
@@ -80,7 +80,7 @@ char min::return#1
 char min::return#2
 char min::return#3
 char min::return#4
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::$0
 char plus::a
 char plus::a#0
@@ -179,7 +179,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   [5] call min
@@ -203,7 +203,7 @@ char min(char a , char b)
 char min::a
 char min::b
 char min::return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 char plus::b
 char plus::return
@@ -320,7 +320,7 @@ char min::a
 char min::b
 char min::return
 __constant char min::return#1 = plus::a#0+plus::b#0 // return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b
diff --git a/src/test/ref/call-banked-phi-case-3-near-0.sym b/src/test/ref/call-banked-phi-case-3-near-0.sym
index f7f6861a8..9e4219f22 100644
--- a/src/test/ref/call-banked-phi-case-3-near-0.sym
+++ b/src/test/ref/call-banked-phi-case-3-near-0.sym
@@ -5,7 +5,7 @@ char min::a
 char min::b
 char min::return
 __constant char min::return#1 = plus::a#0+plus::b#0 // return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b
diff --git a/src/test/ref/call-banked-phi-case-3-near-1.cfg b/src/test/ref/call-banked-phi-case-3-near-1.cfg
index abba7b99a..4a0b60f9d 100644
--- a/src/test/ref/call-banked-phi-case-3-near-1.cfg
+++ b/src/test/ref/call-banked-phi-case-3-near-1.cfg
@@ -11,7 +11,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   [5] call min
diff --git a/src/test/ref/call-banked-phi-case-3-near-1.log b/src/test/ref/call-banked-phi-case-3-near-1.log
index 990511052..e7e2f38ca 100644
--- a/src/test/ref/call-banked-phi-case-3-near-1.log
+++ b/src/test/ref/call-banked-phi-case-3-near-1.log
@@ -18,7 +18,7 @@ main::@return: scope:[main]  from main::@1
   return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   plus::b#1 = phi( main/plus::b#0 )
   plus::a#1 = phi( main/plus::a#0 )
@@ -80,7 +80,7 @@ char min::return#1
 char min::return#2
 char min::return#3
 char min::return#4
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::$0
 char plus::a
 char plus::a#0
@@ -179,7 +179,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   [5] call min
@@ -203,7 +203,7 @@ char min(char a , char b)
 char min::a
 char min::b
 char min::return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 char plus::b
 char plus::return
@@ -320,7 +320,7 @@ char min::a
 char min::b
 char min::return
 __constant char min::return#1 = plus::a#0+plus::b#0 // return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b
diff --git a/src/test/ref/call-banked-phi-case-3-near-1.sym b/src/test/ref/call-banked-phi-case-3-near-1.sym
index f7f6861a8..9e4219f22 100644
--- a/src/test/ref/call-banked-phi-case-3-near-1.sym
+++ b/src/test/ref/call-banked-phi-case-3-near-1.sym
@@ -5,7 +5,7 @@ char min::a
 char min::b
 char min::return
 __constant char min::return#1 = plus::a#0+plus::b#0 // return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b
diff --git a/src/test/ref/call-banked-phi-case-4-near-0.cfg b/src/test/ref/call-banked-phi-case-4-near-0.cfg
index cfd75e701..3a2aea220 100644
--- a/src/test/ref/call-banked-phi-case-4-near-0.cfg
+++ b/src/test/ref/call-banked-phi-case-4-near-0.cfg
@@ -11,7 +11,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   [5] call min
@@ -20,7 +20,7 @@ plus::@return: scope:[plus]  from plus
   [6] return 
   to:@return
 
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 1) char min(char a , char b)
 min: scope:[min]  from plus
   [7] phi()
   to:min::@return
diff --git a/src/test/ref/call-banked-phi-case-4-near-0.log b/src/test/ref/call-banked-phi-case-4-near-0.log
index 25e2d2255..5c2bba535 100644
--- a/src/test/ref/call-banked-phi-case-4-near-0.log
+++ b/src/test/ref/call-banked-phi-case-4-near-0.log
@@ -18,7 +18,7 @@ main::@return: scope:[main]  from main::@1
   return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   plus::b#1 = phi( main/plus::b#0 )
   plus::a#1 = phi( main/plus::a#0 )
@@ -38,7 +38,7 @@ plus::@return: scope:[plus]  from plus::@1
   return 
   to:@return
 
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 1) char min(char a , char b)
 min: scope:[min]  from plus
   min::b#1 = phi( plus/min::b#0 )
   min::a#1 = phi( plus/min::a#0 )
@@ -66,7 +66,7 @@ __constant char * const SCREEN = (char *)$400
 void __start()
 void main()
 char main::$0
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 1) char min(char a , char b)
 char min::$0
 char min::a
 char min::a#0
@@ -80,7 +80,7 @@ char min::return#1
 char min::return#2
 char min::return#3
 char min::return#4
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::$0
 char plus::a
 char plus::a#0
@@ -179,7 +179,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   [5] call min
@@ -188,7 +188,7 @@ plus::@return: scope:[plus]  from plus
   [6] return 
   to:@return
 
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 1) char min(char a , char b)
 min: scope:[min]  from plus
   [7] phi()
   to:min::@return
@@ -199,11 +199,11 @@ min::@return: scope:[min]  from min
 
 VARIABLE REGISTER WEIGHTS
 void main()
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 1) char min(char a , char b)
 char min::a
 char min::b
 char min::return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 char plus::b
 char plus::return
@@ -314,12 +314,12 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 FINAL SYMBOL TABLE
 __constant char * const SCREEN = (char *) 1024
 void main()
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 1) char min(char a , char b)
 char min::a
 char min::b
 char min::return
 __constant char min::return#1 = plus::a#0+plus::b#0 // return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b
diff --git a/src/test/ref/call-banked-phi-case-4-near-0.sym b/src/test/ref/call-banked-phi-case-4-near-0.sym
index aaff351f9..09b563343 100644
--- a/src/test/ref/call-banked-phi-case-4-near-0.sym
+++ b/src/test/ref/call-banked-phi-case-4-near-0.sym
@@ -1,11 +1,11 @@
 __constant char * const SCREEN = (char *) 1024
 void main()
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 1) char min(char a , char b)
 char min::a
 char min::b
 char min::return
 __constant char min::return#1 = plus::a#0+plus::b#0 // return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b
diff --git a/src/test/ref/call-banked-phi-case-4-near-1.cfg b/src/test/ref/call-banked-phi-case-4-near-1.cfg
index cfd75e701..3a2aea220 100644
--- a/src/test/ref/call-banked-phi-case-4-near-1.cfg
+++ b/src/test/ref/call-banked-phi-case-4-near-1.cfg
@@ -11,7 +11,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   [5] call min
@@ -20,7 +20,7 @@ plus::@return: scope:[plus]  from plus
   [6] return 
   to:@return
 
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 1) char min(char a , char b)
 min: scope:[min]  from plus
   [7] phi()
   to:min::@return
diff --git a/src/test/ref/call-banked-phi-case-4-near-1.log b/src/test/ref/call-banked-phi-case-4-near-1.log
index 54b44c7af..36912a129 100644
--- a/src/test/ref/call-banked-phi-case-4-near-1.log
+++ b/src/test/ref/call-banked-phi-case-4-near-1.log
@@ -18,7 +18,7 @@ main::@return: scope:[main]  from main::@1
   return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   plus::b#1 = phi( main/plus::b#0 )
   plus::a#1 = phi( main/plus::a#0 )
@@ -38,7 +38,7 @@ plus::@return: scope:[plus]  from plus::@1
   return 
   to:@return
 
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 1) char min(char a , char b)
 min: scope:[min]  from plus
   min::b#1 = phi( plus/min::b#0 )
   min::a#1 = phi( plus/min::a#0 )
@@ -66,7 +66,7 @@ __constant char * const SCREEN = (char *)$400
 void __start()
 void main()
 char main::$0
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 1) char min(char a , char b)
 char min::$0
 char min::a
 char min::a#0
@@ -80,7 +80,7 @@ char min::return#1
 char min::return#2
 char min::return#3
 char min::return#4
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::$0
 char plus::a
 char plus::a#0
@@ -179,7 +179,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   [5] call min
@@ -188,7 +188,7 @@ plus::@return: scope:[plus]  from plus
   [6] return 
   to:@return
 
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 1) char min(char a , char b)
 min: scope:[min]  from plus
   [7] phi()
   to:min::@return
@@ -199,11 +199,11 @@ min::@return: scope:[min]  from min
 
 VARIABLE REGISTER WEIGHTS
 void main()
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 1) char min(char a , char b)
 char min::a
 char min::b
 char min::return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 char plus::b
 char plus::return
@@ -314,12 +314,12 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 FINAL SYMBOL TABLE
 __constant char * const SCREEN = (char *) 1024
 void main()
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 1) char min(char a , char b)
 char min::a
 char min::b
 char min::return
 __constant char min::return#1 = plus::a#0+plus::b#0 // return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b
diff --git a/src/test/ref/call-banked-phi-case-4-near-1.sym b/src/test/ref/call-banked-phi-case-4-near-1.sym
index aaff351f9..09b563343 100644
--- a/src/test/ref/call-banked-phi-case-4-near-1.sym
+++ b/src/test/ref/call-banked-phi-case-4-near-1.sym
@@ -1,11 +1,11 @@
 __constant char * const SCREEN = (char *) 1024
 void main()
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 1) char min(char a , char b)
 char min::a
 char min::b
 char min::return
 __constant char min::return#1 = plus::a#0+plus::b#0 // return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b
diff --git a/src/test/ref/call-banked-phi-case-5-far-0.cfg b/src/test/ref/call-banked-phi-case-5-far-0.cfg
index cfd75e701..1bdaac9fb 100644
--- a/src/test/ref/call-banked-phi-case-5-far-0.cfg
+++ b/src/test/ref/call-banked-phi-case-5-far-0.cfg
@@ -11,7 +11,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   [5] call min
@@ -20,7 +20,7 @@ plus::@return: scope:[plus]  from plus
   [6] return 
   to:@return
 
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 2) char min(char a , char b)
 min: scope:[min]  from plus
   [7] phi()
   to:min::@return
diff --git a/src/test/ref/call-banked-phi-case-5-far-0.log b/src/test/ref/call-banked-phi-case-5-far-0.log
index a98cea7ee..e0d2540ab 100644
--- a/src/test/ref/call-banked-phi-case-5-far-0.log
+++ b/src/test/ref/call-banked-phi-case-5-far-0.log
@@ -18,7 +18,7 @@ main::@return: scope:[main]  from main::@1
   return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   plus::b#1 = phi( main/plus::b#0 )
   plus::a#1 = phi( main/plus::a#0 )
@@ -38,7 +38,7 @@ plus::@return: scope:[plus]  from plus::@1
   return 
   to:@return
 
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 2) char min(char a , char b)
 min: scope:[min]  from plus
   min::b#1 = phi( plus/min::b#0 )
   min::a#1 = phi( plus/min::a#0 )
@@ -66,7 +66,7 @@ __constant char * const SCREEN = (char *)$400
 void __start()
 void main()
 char main::$0
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 2) char min(char a , char b)
 char min::$0
 char min::a
 char min::a#0
@@ -80,7 +80,7 @@ char min::return#1
 char min::return#2
 char min::return#3
 char min::return#4
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::$0
 char plus::a
 char plus::a#0
@@ -179,7 +179,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   [5] call min
@@ -188,7 +188,7 @@ plus::@return: scope:[plus]  from plus
   [6] return 
   to:@return
 
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 2) char min(char a , char b)
 min: scope:[min]  from plus
   [7] phi()
   to:min::@return
@@ -199,11 +199,11 @@ min::@return: scope:[min]  from min
 
 VARIABLE REGISTER WEIGHTS
 void main()
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 2) char min(char a , char b)
 char min::a
 char min::b
 char min::return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 char plus::b
 char plus::return
@@ -318,12 +318,12 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 FINAL SYMBOL TABLE
 __constant char * const SCREEN = (char *) 1024
 void main()
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 2) char min(char a , char b)
 char min::a
 char min::b
 char min::return
 __constant char min::return#1 = plus::a#0+plus::b#0 // return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b
diff --git a/src/test/ref/call-banked-phi-case-5-far-0.sym b/src/test/ref/call-banked-phi-case-5-far-0.sym
index aaff351f9..7c061e559 100644
--- a/src/test/ref/call-banked-phi-case-5-far-0.sym
+++ b/src/test/ref/call-banked-phi-case-5-far-0.sym
@@ -1,11 +1,11 @@
 __constant char * const SCREEN = (char *) 1024
 void main()
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 2) char min(char a , char b)
 char min::a
 char min::b
 char min::return
 __constant char min::return#1 = plus::a#0+plus::b#0 // return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b
diff --git a/src/test/ref/call-banked-phi-case-5-far-1.cfg b/src/test/ref/call-banked-phi-case-5-far-1.cfg
index cfd75e701..1bdaac9fb 100644
--- a/src/test/ref/call-banked-phi-case-5-far-1.cfg
+++ b/src/test/ref/call-banked-phi-case-5-far-1.cfg
@@ -11,7 +11,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   [5] call min
@@ -20,7 +20,7 @@ plus::@return: scope:[plus]  from plus
   [6] return 
   to:@return
 
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 2) char min(char a , char b)
 min: scope:[min]  from plus
   [7] phi()
   to:min::@return
diff --git a/src/test/ref/call-banked-phi-case-5-far-1.log b/src/test/ref/call-banked-phi-case-5-far-1.log
index 360fff834..af55b2c68 100644
--- a/src/test/ref/call-banked-phi-case-5-far-1.log
+++ b/src/test/ref/call-banked-phi-case-5-far-1.log
@@ -18,7 +18,7 @@ main::@return: scope:[main]  from main::@1
   return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   plus::b#1 = phi( main/plus::b#0 )
   plus::a#1 = phi( main/plus::a#0 )
@@ -38,7 +38,7 @@ plus::@return: scope:[plus]  from plus::@1
   return 
   to:@return
 
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 2) char min(char a , char b)
 min: scope:[min]  from plus
   min::b#1 = phi( plus/min::b#0 )
   min::a#1 = phi( plus/min::a#0 )
@@ -66,7 +66,7 @@ __constant char * const SCREEN = (char *)$400
 void __start()
 void main()
 char main::$0
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 2) char min(char a , char b)
 char min::$0
 char min::a
 char min::a#0
@@ -80,7 +80,7 @@ char min::return#1
 char min::return#2
 char min::return#3
 char min::return#4
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::$0
 char plus::a
 char plus::a#0
@@ -179,7 +179,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   [5] call min
@@ -188,7 +188,7 @@ plus::@return: scope:[plus]  from plus
   [6] return 
   to:@return
 
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 2) char min(char a , char b)
 min: scope:[min]  from plus
   [7] phi()
   to:min::@return
@@ -199,11 +199,11 @@ min::@return: scope:[min]  from min
 
 VARIABLE REGISTER WEIGHTS
 void main()
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 2) char min(char a , char b)
 char min::a
 char min::b
 char min::return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 char plus::b
 char plus::return
@@ -318,12 +318,12 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 FINAL SYMBOL TABLE
 __constant char * const SCREEN = (char *) 1024
 void main()
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 2) char min(char a , char b)
 char min::a
 char min::b
 char min::return
 __constant char min::return#1 = plus::a#0+plus::b#0 // return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b
diff --git a/src/test/ref/call-banked-phi-case-5-far-1.sym b/src/test/ref/call-banked-phi-case-5-far-1.sym
index aaff351f9..7c061e559 100644
--- a/src/test/ref/call-banked-phi-case-5-far-1.sym
+++ b/src/test/ref/call-banked-phi-case-5-far-1.sym
@@ -1,11 +1,11 @@
 __constant char * const SCREEN = (char *) 1024
 void main()
-__bank(bank) char min(char a , char b)
+__bank(cx16_ram, 2) char min(char a , char b)
 char min::a
 char min::b
 char min::return
 __constant char min::return#1 = plus::a#0+plus::b#0 // return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b
diff --git a/src/test/ref/call-banked-phi-case-6-close-0.cfg b/src/test/ref/call-banked-phi-case-6-close-0.cfg
index cfd75e701..62e999ce1 100644
--- a/src/test/ref/call-banked-phi-case-6-close-0.cfg
+++ b/src/test/ref/call-banked-phi-case-6-close-0.cfg
@@ -11,7 +11,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   [5] call min
@@ -20,7 +20,7 @@ plus::@return: scope:[plus]  from plus
   [6] return 
   to:@return
 
-__bank(bank) char min(char a , char b)
+__bank(cx16_rom, 1) char min(char a , char b)
 min: scope:[min]  from plus
   [7] phi()
   to:min::@return
diff --git a/src/test/ref/call-banked-phi-case-6-close-0.log b/src/test/ref/call-banked-phi-case-6-close-0.log
index fce99e78f..989ffb846 100644
--- a/src/test/ref/call-banked-phi-case-6-close-0.log
+++ b/src/test/ref/call-banked-phi-case-6-close-0.log
@@ -18,7 +18,7 @@ main::@return: scope:[main]  from main::@1
   return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   plus::b#1 = phi( main/plus::b#0 )
   plus::a#1 = phi( main/plus::a#0 )
@@ -38,7 +38,7 @@ plus::@return: scope:[plus]  from plus::@1
   return 
   to:@return
 
-__bank(bank) char min(char a , char b)
+__bank(cx16_rom, 1) char min(char a , char b)
 min: scope:[min]  from plus
   min::b#1 = phi( plus/min::b#0 )
   min::a#1 = phi( plus/min::a#0 )
@@ -66,7 +66,7 @@ __constant char * const SCREEN = (char *)$400
 void __start()
 void main()
 char main::$0
-__bank(bank) char min(char a , char b)
+__bank(cx16_rom, 1) char min(char a , char b)
 char min::$0
 char min::a
 char min::a#0
@@ -80,7 +80,7 @@ char min::return#1
 char min::return#2
 char min::return#3
 char min::return#4
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::$0
 char plus::a
 char plus::a#0
@@ -179,7 +179,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   [5] call min
@@ -188,7 +188,7 @@ plus::@return: scope:[plus]  from plus
   [6] return 
   to:@return
 
-__bank(bank) char min(char a , char b)
+__bank(cx16_rom, 1) char min(char a , char b)
 min: scope:[min]  from plus
   [7] phi()
   to:min::@return
@@ -199,11 +199,11 @@ min::@return: scope:[min]  from min
 
 VARIABLE REGISTER WEIGHTS
 void main()
-__bank(bank) char min(char a , char b)
+__bank(cx16_rom, 1) char min(char a , char b)
 char min::a
 char min::b
 char min::return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 char plus::b
 char plus::return
@@ -321,12 +321,12 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 FINAL SYMBOL TABLE
 __constant char * const SCREEN = (char *) 1024
 void main()
-__bank(bank) char min(char a , char b)
+__bank(cx16_rom, 1) char min(char a , char b)
 char min::a
 char min::b
 char min::return
 __constant char min::return#1 = plus::a#0+plus::b#0 // return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b
diff --git a/src/test/ref/call-banked-phi-case-6-close-0.sym b/src/test/ref/call-banked-phi-case-6-close-0.sym
index aaff351f9..ada067df8 100644
--- a/src/test/ref/call-banked-phi-case-6-close-0.sym
+++ b/src/test/ref/call-banked-phi-case-6-close-0.sym
@@ -1,11 +1,11 @@
 __constant char * const SCREEN = (char *) 1024
 void main()
-__bank(bank) char min(char a , char b)
+__bank(cx16_rom, 1) char min(char a , char b)
 char min::a
 char min::b
 char min::return
 __constant char min::return#1 = plus::a#0+plus::b#0 // return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b
diff --git a/src/test/ref/call-banked-phi-case-6-close-1.cfg b/src/test/ref/call-banked-phi-case-6-close-1.cfg
index cfd75e701..62e999ce1 100644
--- a/src/test/ref/call-banked-phi-case-6-close-1.cfg
+++ b/src/test/ref/call-banked-phi-case-6-close-1.cfg
@@ -11,7 +11,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   [5] call min
@@ -20,7 +20,7 @@ plus::@return: scope:[plus]  from plus
   [6] return 
   to:@return
 
-__bank(bank) char min(char a , char b)
+__bank(cx16_rom, 1) char min(char a , char b)
 min: scope:[min]  from plus
   [7] phi()
   to:min::@return
diff --git a/src/test/ref/call-banked-phi-case-6-close-1.log b/src/test/ref/call-banked-phi-case-6-close-1.log
index 37e02e3ea..e84a846b0 100644
--- a/src/test/ref/call-banked-phi-case-6-close-1.log
+++ b/src/test/ref/call-banked-phi-case-6-close-1.log
@@ -18,7 +18,7 @@ main::@return: scope:[main]  from main::@1
   return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   plus::b#1 = phi( main/plus::b#0 )
   plus::a#1 = phi( main/plus::a#0 )
@@ -38,7 +38,7 @@ plus::@return: scope:[plus]  from plus::@1
   return 
   to:@return
 
-__bank(bank) char min(char a , char b)
+__bank(cx16_rom, 1) char min(char a , char b)
 min: scope:[min]  from plus
   min::b#1 = phi( plus/min::b#0 )
   min::a#1 = phi( plus/min::a#0 )
@@ -66,7 +66,7 @@ __constant char * const SCREEN = (char *)$400
 void __start()
 void main()
 char main::$0
-__bank(bank) char min(char a , char b)
+__bank(cx16_rom, 1) char min(char a , char b)
 char min::$0
 char min::a
 char min::a#0
@@ -80,7 +80,7 @@ char min::return#1
 char min::return#2
 char min::return#3
 char min::return#4
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::$0
 char plus::a
 char plus::a#0
@@ -179,7 +179,7 @@ main::@return: scope:[main]  from main::@1
   [3] return 
   to:@return
 
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 plus: scope:[plus]  from main
   [4] phi()
   [5] call min
@@ -188,7 +188,7 @@ plus::@return: scope:[plus]  from plus
   [6] return 
   to:@return
 
-__bank(bank) char min(char a , char b)
+__bank(cx16_rom, 1) char min(char a , char b)
 min: scope:[min]  from plus
   [7] phi()
   to:min::@return
@@ -199,11 +199,11 @@ min::@return: scope:[min]  from min
 
 VARIABLE REGISTER WEIGHTS
 void main()
-__bank(bank) char min(char a , char b)
+__bank(cx16_rom, 1) char min(char a , char b)
 char min::a
 char min::b
 char min::return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 char plus::b
 char plus::return
@@ -321,12 +321,12 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 FINAL SYMBOL TABLE
 __constant char * const SCREEN = (char *) 1024
 void main()
-__bank(bank) char min(char a , char b)
+__bank(cx16_rom, 1) char min(char a , char b)
 char min::a
 char min::b
 char min::return
 __constant char min::return#1 = plus::a#0+plus::b#0 // return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b
diff --git a/src/test/ref/call-banked-phi-case-6-close-1.sym b/src/test/ref/call-banked-phi-case-6-close-1.sym
index aaff351f9..ada067df8 100644
--- a/src/test/ref/call-banked-phi-case-6-close-1.sym
+++ b/src/test/ref/call-banked-phi-case-6-close-1.sym
@@ -1,11 +1,11 @@
 __constant char * const SCREEN = (char *) 1024
 void main()
-__bank(bank) char min(char a , char b)
+__bank(cx16_rom, 1) char min(char a , char b)
 char min::a
 char min::b
 char min::return
 __constant char min::return#1 = plus::a#0+plus::b#0 // return
-__bank(bank) char plus(char a , char b)
+__bank(cx16_ram, 1) char plus(char a , char b)
 char plus::a
 __constant char plus::a#0 = '0' // a
 char plus::b