diff --git a/runtime/legion/region_tree.inl b/runtime/legion/region_tree.inl
index d9b4dec443..7796eba0a9 100644
--- a/runtime/legion/region_tree.inl
+++ b/runtime/legion/region_tree.inl
@@ -2783,7 +2783,7 @@ namespace Legion {
     {
       DETAILED_PROFILER(context->runtime, REALM_CREATE_INSTANCE_CALL);
       // Have to wait for the index space to be ready if necessary
-      Realm::ZIndexSpace<DIM,T> local_space;
+      Realm::IndexSpace<DIM,T> local_space;
       get_realm_index_space(local_space, true/*tight*/);
       // No profiling for these kinds of instances currently
       Realm::ProfilingRequestSet requests;
@@ -2794,8 +2794,8 @@ namespace Legion {
       PhysicalInstance result;
       if (layout_flag == 0) {  // SOA
         LgEvent ready(PhysicalInstance::create_array_instance_SOA(result, 
-				           local_space,
-                   field_ids,
+				                             local_space,
+                                                             field_ids,
 							     field_sizes,
 							     field_pointers,
 							     c_f_resource,
@@ -2803,12 +2803,12 @@ namespace Legion {
         ready.lg_wait();
       } else {  // AOS
         LgEvent ready(PhysicalInstance::create_array_instance_AOS(result, 
-				           local_space,
-                   field_ids,
+				                             local_space,
+                                                             field_ids,
 							     field_sizes,
 							     field_pointers,
 							     aos_base_ptr, aos_stride,
-                   c_f_resource,
+                                                             c_f_resource,
 							     requests));
         ready.lg_wait();
       }
diff --git a/runtime/realm/attach_array.cc b/runtime/realm/attach_array.cc
index 0b347d128e..c3237a1cdc 100644
--- a/runtime/realm/attach_array.cc
+++ b/runtime/realm/attach_array.cc
@@ -24,10 +24,10 @@ namespace Realm {
   
   template <int N, typename T>
   /*static*/ Event RegionInstance::create_array_instance_SOA(RegionInstance& inst,
-							  const ZIndexSpace<N,T>& space,
-                const std::vector<FieldID> &field_ids,
+							  const IndexSpace<N,T>& space,
+                                                          const std::vector<FieldID> &field_ids,
 							  const std::vector<size_t> &field_sizes,
-                const std::vector<void*> &field_pointers,
+                                                          const std::vector<void*> &field_pointers,
 							  int resource,
 							  const ProfilingRequestSet& reqs,
 							  Event wait_on /*= Event::NO_EVENT*/)
@@ -83,8 +83,8 @@ namespace Realm {
 
 #define DOIT_ARRAY_SOA(N,T) \
   template Event RegionInstance::create_array_instance_SOA<N,T>(RegionInstance&, \
-							      const ZIndexSpace<N,T>&, \
-                    const std::vector<FieldID>&, \
+							      const IndexSpace<N,T>&, \
+                                                              const std::vector<FieldID>&, \
 							      const std::vector<size_t>&, \
 							      const std::vector<void *>&, \
 							      int, \
@@ -94,12 +94,12 @@ namespace Realm {
     
   template <int N, typename T>
   /*static*/ Event RegionInstance::create_array_instance_AOS(RegionInstance& inst,
-							  const ZIndexSpace<N,T>& space,
-                const std::vector<FieldID> &field_ids,
+							  const IndexSpace<N,T>& space,
+                                                          const std::vector<FieldID> &field_ids,
 							  const std::vector<size_t> &field_sizes,
-                const std::vector<void*> &field_pointers,
+                                                          const std::vector<void*> &field_pointers,
 							  unsigned char* aos_base_ptr, size_t aos_stride,
-                int resource,
+                                                          int resource,
 							  const ProfilingRequestSet& reqs,
 							  Event wait_on /*= Event::NO_EVENT*/)
   {
@@ -156,12 +156,12 @@ namespace Realm {
 
 #define DOIT_ARRAY_AOS(N,T) \
   template Event RegionInstance::create_array_instance_AOS<N,T>(RegionInstance&, \
-							      const ZIndexSpace<N,T>&, \
-                    const std::vector<FieldID>&, \
+							      const IndexSpace<N,T>&, \
+                                                              const std::vector<FieldID>&, \
 							      const std::vector<size_t>&, \
 							      const std::vector<void *>&, \
 							      unsigned char*, size_t, \
-                    int, \
+                                                              int, \
 							      const ProfilingRequestSet&, \
 							      Event);
   FOREACH_NT(DOIT_ARRAY_AOS)  
diff --git a/runtime/realm/instance.h b/runtime/realm/instance.h
index f9196ed76e..862a563aad 100644
--- a/runtime/realm/instance.h
+++ b/runtime/realm/instance.h
@@ -158,8 +158,8 @@ namespace Realm {
               
     template <int N, typename T>
     static Event create_array_instance_SOA(RegionInstance& inst,
-				      const ZIndexSpace<N,T>& space,
-              const std::vector<FieldID> &field_ids,
+				      const IndexSpace<N,T>& space,
+                                      const std::vector<FieldID> &field_ids,
 				      const std::vector<size_t> &field_sizes,
 				      const std::vector<void*> &field_pointers,
 				      int resource,
@@ -168,12 +168,12 @@ namespace Realm {
               
     template <int N, typename T>
     static Event create_array_instance_AOS(RegionInstance& inst,
-				      const ZIndexSpace<N,T>& space,
-              const std::vector<FieldID> &field_ids,
+				      const IndexSpace<N,T>& space,
+                                      const std::vector<FieldID> &field_ids,
 				      const std::vector<size_t> &field_sizes,
 				      const std::vector<void*> &field_pointers,
 				      unsigned char* aos_base_ptr, size_t aos_stride,
-              int resource,
+                                      int resource,
 				      const ProfilingRequestSet& prs,
 				      Event wait_on = Event::NO_EVENT);