diff --git a/mps/test/function/137.c b/mps/test/function/137.c
index 4366f0a5077..178d2f5e628 100644
--- a/mps/test/function/137.c
+++ b/mps/test/function/137.c
@@ -47,7 +47,7 @@ static void test(void) {
  unsigned int i;
  unsigned long nLarge;
 
- cdie(mps_arena_create(&arena, mps_arena_class_vmnz(),
+ cdie(mps_arena_create(&arena, mps_arena_class_vm(),
   (size_t) (1024*1024*50)), "create arena");
  cdie(mps_thread_reg(&thread, arena), "register thread");
 
diff --git a/mps/test/function/139.c b/mps/test/function/139.c
index 7e698b887dd..14537004366 100644
--- a/mps/test/function/139.c
+++ b/mps/test/function/139.c
@@ -37,7 +37,7 @@ static void test(void) {
  unsigned int i;
  unsigned long nLarge;
 
- cdie(mps_arena_create(&arena, mps_arena_class_vmnz(),
+ cdie(mps_arena_create(&arena, mps_arena_class_vm(),
   (size_t) (1024*1024*50)), "create arena");
  cdie(mps_thread_reg(&thread, arena), "register thread");
 
diff --git a/mps/test/function/144.c b/mps/test/function/144.c
index d83b354fd61..efbcf4d9d29 100644
--- a/mps/test/function/144.c
+++ b/mps/test/function/144.c
@@ -25,7 +25,7 @@ static void test(void) {
  mps_addr_t a, b;
  char *c;
 
- cdie(mps_arena_create(&arena, mps_arena_class_vmnz(),
+ cdie(mps_arena_create(&arena, mps_arena_class_vm(),
   (size_t) (1024*1024*50)), "create arena");
  cdie(mps_thread_reg(&thread, arena), "register thread");
 
diff --git a/mps/test/function/158.c b/mps/test/function/158.c
index 7331f82689f..b257d879f30 100644
--- a/mps/test/function/158.c
+++ b/mps/test/function/158.c
@@ -25,7 +25,7 @@ static void test(void) {
  mps_pool_t pool;
  mps_addr_t a;
 
- cdie(mps_arena_create(&arena, mps_arena_class_vmnz(),
+ cdie(mps_arena_create(&arena, mps_arena_class_vm(),
   (size_t) (1024*1024*50)), "create arena");
  cdie(mps_thread_reg(&thread, arena), "register thread");
 
diff --git a/mps/test/function/159.c b/mps/test/function/159.c
index c8c1843fc8b..d3fb350003f 100644
--- a/mps/test/function/159.c
+++ b/mps/test/function/159.c
@@ -25,7 +25,7 @@ static void test(void) {
  mps_addr_t a;
  char * c;
 
- cdie(mps_arena_create(&arena, mps_arena_class_vmnz(),
+ cdie(mps_arena_create(&arena, mps_arena_class_vm(),
   (size_t) (1024*1024*50)), "create arena");
  cdie(mps_thread_reg(&thread, arena), "register thread");
 
diff --git a/mps/test/function/160.c b/mps/test/function/160.c
index 6406a5d1243..4c58a5058aa 100644
--- a/mps/test/function/160.c
+++ b/mps/test/function/160.c
@@ -25,7 +25,7 @@ static void test(void) {
  mps_addr_t a;
  char *c;
 
- cdie(mps_arena_create(&arena, mps_arena_class_vmnz(),
+ cdie(mps_arena_create(&arena, mps_arena_class_vm(),
   (size_t) (1024*1024*50)), "create arena");
  cdie(mps_thread_reg(&thread, arena), "register thread");
 
diff --git a/mps/test/function/161.c b/mps/test/function/161.c
index 1c4d06d6e36..93ede5ed738 100644
--- a/mps/test/function/161.c
+++ b/mps/test/function/161.c
@@ -28,7 +28,7 @@ static void test(void)
  mps_pool_t pool;
  mps_addr_t a;
 
- cdie(mps_arena_create(&arena, mps_arena_class_vmnz(),
+ cdie(mps_arena_create(&arena, mps_arena_class_vm(),
   (size_t) (1024*1024*50)), "create arena");
  cdie(mps_thread_reg(&thread, arena), "register thread");
 
diff --git a/mps/test/function/162.c b/mps/test/function/162.c
index 1b93d1e9e51..05245b7191c 100644
--- a/mps/test/function/162.c
+++ b/mps/test/function/162.c
@@ -25,7 +25,7 @@ static void test(void) {
  mps_addr_t a;
  char * c;
 
- cdie(mps_arena_create(&arena, mps_arena_class_vmnz(),
+ cdie(mps_arena_create(&arena, mps_arena_class_vm(),
   (size_t) (1024*1024*50)), "create arena");
  cdie(mps_thread_reg(&thread, arena), "register thread");
 
diff --git a/mps/test/function/163.c b/mps/test/function/163.c
index e7f24197bf8..90e04b83b23 100644
--- a/mps/test/function/163.c
+++ b/mps/test/function/163.c
@@ -47,7 +47,7 @@ static void test(void) {
  unsigned int i;
  unsigned long nLarge;
 
- cdie(mps_arena_create(&arena, mps_arena_class_vmnz(),
+ cdie(mps_arena_create(&arena, mps_arena_class_vm(),
   (size_t) (1024*1024*50)), "create arena");
  cdie(mps_thread_reg(&thread, arena), "register thread");
 
diff --git a/mps/test/function/165.c b/mps/test/function/165.c
index d267c08a531..37ce5d8eee3 100644
--- a/mps/test/function/165.c
+++ b/mps/test/function/165.c
@@ -35,9 +35,9 @@ static void test(void)
 
  unsigned long com0, com1, com2;
 
-/* create a VM arena of 30MB */
+/* create a VM arena of 40MB */
 
- cdie(mps_arena_create(&arena, mps_arena_class_vmnz(), (size_t) (1024*1024*40)),
+ cdie(mps_arena_create(&arena, mps_arena_class_vm(), (size_t)(1024*1024*40)),
   "create arena");
 
 /* set the commit limit to 100MB, i.e. let the arena do the limiting */
diff --git a/mps/test/function/167.c b/mps/test/function/167.c
index aba5607ddbc..f33a551e011 100644
--- a/mps/test/function/167.c
+++ b/mps/test/function/167.c
@@ -33,9 +33,9 @@ static void test(void)
 
  unsigned long com0, com1;
 
-/* create a VM arena of 30MB */
+/* create a VM arena of 40MB */
 
- cdie(mps_arena_create(&arena, mps_arena_class_vmnz(), (size_t) (1024*1024*40)),
+ cdie(mps_arena_create(&arena, mps_arena_class_vm(), (size_t)(1024*1024*40)),
   "create arena");
 
 
diff --git a/mps/test/function/170.c b/mps/test/function/170.c
index 53ff1bfb587..cc7232fc95d 100644
--- a/mps/test/function/170.c
+++ b/mps/test/function/170.c
@@ -196,7 +196,7 @@ static void test(void)
 
  /* create a VM arena of 100MB */
 
- cdie(mps_arena_create(&arena,mps_arena_class_vmnz(),(size_t)(1024*1024*100)),
+ cdie(mps_arena_create(&arena, mps_arena_class_vm(), (size_t)(1024*1024*100)),
   "create arena");
 
  cdie(mps_thread_reg(&thread, arena), "register thread");