diff --git a/package.json b/package.json
index 2475726f3dc9a83f540f6b9a170d6294af33f5e4..c2e396730cf684a3ba4dd19fa78cd39d6c3d9b4d 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "watch": "ng build --watch --configuration development",
     "test": "ng test",
     "test-ci": "ng test --progress false --watch false --browsers=ChromeHeadless",
-    "sapi-schema": "npx openapi-typescript@6.1.0 https://siibra-api-latest.apps-dev.hbp.eu/v3_0/openapi.json --output ./src/atlasComponents/sapi/schema_v3.ts && eslint ./src/atlasComponents/sapi/schema_v3.ts --no-ignore --fix",
+    "sapi-schema": "npx openapi-typescript@6.1.0 https://siibra-api-latest.apps-dev.hbp.eu/v3_0/openapi.json --output ./src/atlasComponents/sapi/schemaV3.ts && eslint ./src/atlasComponents/sapi/schemaV3.ts --no-ignore --fix",
     "api-schema": "node src/plugin/generateTypes.js",
     "docs:json": "compodoc -p ./tsconfig.json -e json -d .",
     "storybook": "npm run docs:json && start-storybook -p 6006",
diff --git a/src/api/service.ts b/src/api/service.ts
index e2604e4320bfe6fee4d10850a52c1dc4facde280..9e68398251d25590c838ae15f65af7205ffc4cd1 100644
--- a/src/api/service.ts
+++ b/src/api/service.ts
@@ -3,8 +3,8 @@ import { select, Store } from "@ngrx/store";
 import { Subject } from "rxjs";
 import { distinctUntilChanged, filter, map, switchMap, take } from "rxjs/operators";
 import { SAPI } from "src/atlasComponents/sapi";
-import { SxplrAtlas, SxplrParcellation, SxplrRegion, SxplrTemplate, Point } from "src/atlasComponents/sapi/type_sxplr";
-import { SxplrCoordinatePointExtension } from "src/atlasComponents/sapi/type_v3";
+import { SxplrAtlas, SxplrParcellation, SxplrRegion, SxplrTemplate, Point } from "src/atlasComponents/sapi/sxplrTypes";
+import { SxplrCoordinatePointExtension } from "src/atlasComponents/sapi/typeV3";
 import { MainState, atlasSelection, userInteraction, annotation, atlasAppearance } from "src/state"
 import { ClickInterceptor, CLICK_INTERCEPTOR_INJECTOR } from "src/util";
 import { CANCELLABLE_DIALOG, CANCELLABLE_DIALOG_OPTS } from "src/util/interfaces";
diff --git a/src/atlasComponents/sapi/core/base.ts b/src/atlasComponents/sapi/core/base.ts
index 5649c6ba101cf584841f5f3653c28a9b9d897915..9783082a284974c593798f1e05cd11cf0d17b0e0 100644
--- a/src/atlasComponents/sapi/core/base.ts
+++ b/src/atlasComponents/sapi/core/base.ts
@@ -1,6 +1,7 @@
 import { Observable } from "rxjs"
 import { SAPI } from "../sapi.service"
-import { RouteParam, SapiQueryPriorityArg } from "../type_v3"
+import { RouteParam } from "../typeV3"
+import { SapiQueryPriorityArg } from "../sxplrTypes"
 
 const AllFeatures = {
   // Feature: "Feature",
diff --git a/src/atlasComponents/sapi/core/sapiParcellation.ts b/src/atlasComponents/sapi/core/sapiParcellation.ts
index 7d36e1202ca3e39140d037ca04a997372904714d..bfeb49d484b26ddca6f781a254ee4ca929c1e951 100644
--- a/src/atlasComponents/sapi/core/sapiParcellation.ts
+++ b/src/atlasComponents/sapi/core/sapiParcellation.ts
@@ -1,7 +1,7 @@
 import { Observable, of } from "rxjs"
-import { switchMap } from "rxjs/operators"
 import { SAPI } from "../sapi.service"
-import { SapiParcellationModel, SapiQueryPriorityArg, SapiRegionModel, RouteParam } from "../type_v3"
+import { SapiParcellationModel } from "../typeV3"
+import { SapiQueryPriorityArg } from "../sxplrTypes"
 import { SAPIBase } from "./base"
 
 /**
diff --git a/src/atlasComponents/sapi/core/sapiRegion.ts b/src/atlasComponents/sapi/core/sapiRegion.ts
index a8fd531d9d5f2e4746c7c4654512ca0c640e4121..942859c6fb33390c8c36585d4b7869181f300cbc 100644
--- a/src/atlasComponents/sapi/core/sapiRegion.ts
+++ b/src/atlasComponents/sapi/core/sapiRegion.ts
@@ -1,10 +1,10 @@
 import { SAPI } from "..";
-import { SapiRegionModel, RouteParam } from "../type_v3";
+import { SapiRegionModel, RouteParam } from "../typeV3";
 import { strToRgb, hexToRgb } from 'common/util'
 import { NEVER, Observable, of } from "rxjs";
 import { map } from "rxjs/operators";
 import { SAPIBase } from "./base";
-import { SxplrRegion } from "../type_sxplr";
+import { SxplrRegion } from "../sxplrTypes";
 
 /**
  * All valid region features
diff --git a/src/atlasComponents/sapi/core/sapiSpace.ts b/src/atlasComponents/sapi/core/sapiSpace.ts
index a11e997862de15d8c855d6e3bc8d522684e89c67..e1826a6d97d116f23a46af1378c344d1aa56d5d0 100644
--- a/src/atlasComponents/sapi/core/sapiSpace.ts
+++ b/src/atlasComponents/sapi/core/sapiSpace.ts
@@ -1,9 +1,8 @@
 import { Observable, of, throwError } from "rxjs"
 import { SAPI } from '../sapi.service'
-import { SxplrTemplate } from "../type_sxplr"
+import { SxplrTemplate, SapiQueryPriorityArg } from "../sxplrTypes"
 import { map, switchMap } from "rxjs/operators"
 import { SAPIBase } from "./base"
-import { SapiQueryPriorityArg } from "../type_v3"
 
 /**
  * All valid parcellation features
diff --git a/src/atlasComponents/sapi/sapi.service.ts b/src/atlasComponents/sapi/sapi.service.ts
index 8b0e84ee3363499c8126ddc7ae5e9c8b540450e9..924fce5ce1c7181ac2b7e5fdaf54b00a05aacb5d 100644
--- a/src/atlasComponents/sapi/sapi.service.ts
+++ b/src/atlasComponents/sapi/sapi.service.ts
@@ -1,16 +1,10 @@
 import { Injectable } from "@angular/core";
 import { HttpClient } from '@angular/common/http';
 import { catchError, map, shareReplay, switchMap, take, tap } from "rxjs/operators";
-import { SAPIAtlas, SAPISpace } from './core'
-import {
-  SapiQueryPriorityArg,
-} from "./type_v3";
 import {
   translateV3Entities
-} from "./translate_v3"
+} from "./translateV3"
 import { getExportNehuba } from "src/util/fn";
-import { SAPIParcellation } from "./core/sapiParcellation";
-import { SAPIRegion } from "./core/sapiRegion"
 import { MatSnackBar } from "@angular/material/snack-bar";
 import { AtlasWorkerService } from "src/atlasViewer/atlasViewer.workerService.service";
 import { EnumColorMapName } from "src/util/colorMaps";
@@ -18,8 +12,8 @@ import { PRIORITY_HEADER } from "src/util/priority";
 import { forkJoin, from, NEVER, Observable, of, throwError } from "rxjs";
 import { SAPIFeature } from "./features";
 import { environment } from "src/environments/environment"
-import { PathReturn, RouteParam, SapiRoute } from "./type_v3";
-import { BoundingBox, SxplrAtlas, SxplrParcellation, SxplrRegion, SxplrTemplate, VoiFeature } from "./type_sxplr";
+import { PathReturn, RouteParam, SapiRoute } from "./typeV3";
+import { BoundingBox, SxplrAtlas, SxplrParcellation, SxplrRegion, SxplrTemplate, VoiFeature, SapiQueryPriorityArg } from "./sxplrTypes";
 
 
 export const SIIBRA_API_VERSION_HEADER_KEY='x-siibra-api-version'
@@ -145,29 +139,7 @@ export class SAPI{
 
   static ErrorMessage = null
 
-  getSpaceDetail(_atlasId: string, spaceId: string, param?: SapiQueryPriorityArg): Observable<SxplrTemplate> {
-    return this.v3Get("/spaces/{space_id}", {
-      path: {
-        space_id: spaceId
-      },
-      priority: param?.priority
-    }).pipe(
-      switchMap(v => translateV3Entities.translateTemplate(v))
-    )
-  }
-
-  getParcDetail(atlasId: string, parcId: string, param?: SapiQueryPriorityArg): Observable<SxplrParcellation> {
-    return this.v3Get("/parcellations/{parcellation_id}", {
-      path: {
-        parcellation_id: parcId
-      },
-      priority: param?.priority
-    }).pipe(
-      switchMap(v => translateV3Entities.translateParcellation(v))
-    )
-  }
-
-  getParcRegions(atlasId: string, parcId: string, spaceId: string, queryParam?: SapiQueryPriorityArg) {
+  getParcRegions(parcId: string, queryParam?: SapiQueryPriorityArg) {
     const param = {
       query: {
         parcellation_id: parcId,
@@ -201,7 +173,7 @@ export class SAPI{
       }
     })
   }
-
+  
   getFeature(featureId: string, opts: Record<string, string> = {}) {
     return new SAPIFeature(this, featureId, opts)
   }
@@ -337,6 +309,54 @@ export class SAPI{
     )
   }
 
+  public getStatisticalMap(parcellation: SxplrParcellation, template: SxplrTemplate, region: SxplrRegion) {
+    const query = {
+      parcellation_id: parcellation.id,
+      region_id: region.name,
+      space_id: template.id
+    }
+    return SAPI.BsEndpoint$.pipe(
+      switchMap(endpoint => {
+        const _url = this.v3GetRoute("/map/statistical_map.nii.gz", {
+          query
+        })
+        const url = new URL(`${endpoint}${_url.path}`)
+        for (const key in _url.params) {
+          url.searchParams.set(key, _url.params[key].toString())
+        }
+        
+        return from((async () => {
+          const resp = await fetch(url)
+          const arraybuffer = await resp.arrayBuffer()
+          let outbuf: ArrayBuffer
+          try {
+            outbuf = getExportNehuba().pako.inflate(arraybuffer).buffer
+          } catch (e) {
+            console.log("unpack error", e)
+            outbuf = arraybuffer
+          }
+      
+          const { result } = await this.workerSvc.sendMessage({
+            method: "PROCESS_NIFTI",
+            param: {
+              nifti: outbuf,
+            },
+            transfers: [outbuf],
+          })
+
+          const { meta, buffer } = result
+          return { meta, buffer } as {
+            meta: {
+              min: number
+              max: number
+            }
+            buffer: ArrayBuffer
+          }
+        })())
+      })
+    )
+  }
+
   #parcIdToTmplMap = new Map<string, SxplrTemplate[]>()
   public getSupportedTemplates(atlas: SxplrAtlas, parc: SxplrParcellation): Observable<SxplrTemplate[]> {
     if (!parc) {
diff --git a/src/atlasComponents/sapi/schema_v3.ts b/src/atlasComponents/sapi/schemaV3.ts
similarity index 100%
rename from src/atlasComponents/sapi/schema_v3.ts
rename to src/atlasComponents/sapi/schemaV3.ts
diff --git a/src/atlasComponents/sapi/type_sxplr.ts b/src/atlasComponents/sapi/sxplrTypes.ts
similarity index 84%
rename from src/atlasComponents/sapi/type_sxplr.ts
rename to src/atlasComponents/sapi/sxplrTypes.ts
index 0e5d6f8a7f21d1799eb592db59563b2c25c3a9fc..7626acbf313b9e0889dbbf4013aa0fb295875172 100644
--- a/src/atlasComponents/sapi/type_sxplr.ts
+++ b/src/atlasComponents/sapi/sxplrTypes.ts
@@ -6,11 +6,12 @@
 
 
 /**
- * TODO do a global search on type_v3
- * anything outside src/atlasComponent should directly import from type_sxplr, and not from type_v3, or worse type, schema_v3
+ * TODO do a global search on typeV3
+ * anything outside src/atlasComponent should directly import from sxplrTypes, and not from typeV3, or worse type, schemaV3
  */
 
 export type SxplrRegion = {
+  type: 'SxplrRegion'
   id: string
   name: string
   centroid?: Point
@@ -19,17 +20,20 @@ export type SxplrRegion = {
 } & Partial<AdditionalInfo>
 
 export type SxplrParcellation = {
+  type: 'SxplrParcellation'
   id: string
   name: string
   modality?: string
 } & Partial<AdditionalInfo>
 
 export type SxplrTemplate = {
+  type: 'SxplrTemplate'
   id: string
   name: string
 } & Partial<AdditionalInfo>
 
 export type SxplrAtlas = {
+  type: 'SxplrAtlas'
   id: string
   name: string
 } & Partial<AdditionalInfo>
@@ -102,3 +106,17 @@ export type LabelledMap = {
   name: string
   label: number
 }
+
+export type StatisticalMap = {
+  url: string
+  min: number
+  max: number
+}
+
+
+/**
+ * Support types
+ */
+export type SapiQueryPriorityArg = {
+  priority: number
+}
diff --git a/src/atlasComponents/sapi/translate_v3.ts b/src/atlasComponents/sapi/translateV3.ts
similarity index 96%
rename from src/atlasComponents/sapi/translate_v3.ts
rename to src/atlasComponents/sapi/translateV3.ts
index 7851f3f71b877748dbc7d3d9c13a684a79e6bf2e..d8505ceda11b8c093295f6e3cec2608014f35026 100644
--- a/src/atlasComponents/sapi/translate_v3.ts
+++ b/src/atlasComponents/sapi/translateV3.ts
@@ -1,9 +1,9 @@
 import {
   SxplrAtlas, SxplrParcellation, SxplrTemplate, SxplrRegion, NgLayerSpec, NgPrecompMeshSpec, NgSegLayerSpec, VoiFeature, Point, TemplateDefaultImage, TThreeSurferMesh, TThreeMesh, LabelledMap
-} from "./type_sxplr"
-import { PathReturn } from "./type_v3"
+} from "./sxplrTypes"
+import { PathReturn } from "./typeV3"
 import { hexToRgb } from 'common/util'
-import { components } from "./schema_v3"
+import { components } from "./schemaV3"
 
 
 class TranslateV3 {
@@ -16,6 +16,7 @@ class TranslateV3 {
     this.#atlasMap.set(atlas["@id"], atlas)
     return {
       id: atlas["@id"],
+      type: "SxplrAtlas",
       name: atlas.name
     }
   }
@@ -29,6 +30,7 @@ class TranslateV3 {
       id: parcellation["@id"],
       name: parcellation.name,
       modality: parcellation.modality,
+      type: "SxplrParcellation"
     }
   }
 
@@ -40,7 +42,8 @@ class TranslateV3 {
     this.#templateMap.set(template["@id"], template)
     return {
       id: template["@id"],
-      name: template.fullName
+      name: template.fullName,
+      type: "SxplrTemplate"
     }
   }
 
@@ -59,7 +62,8 @@ class TranslateV3 {
       id: region["@id"],
       name: region.name,
       color: hexToRgb(region.hasAnnotation?.displayColor) as [number, number, number],
-      parentIds: region.hasParent.map( v => v["@id"] )
+      parentIds: region.hasParent.map( v => v["@id"] ),
+      type: "SxplrRegion"
     }
   }
 
@@ -161,17 +165,20 @@ class TranslateV3 {
   }
 
   async translateLabelledMapToThreeLabel(map:PathReturn<"/map">) {
-    const threeLabelMap: Record<string, { laterality: 'left' | 'right', url: string, regions: Record<string, number> }> = {}
+    const threeLabelMap: Record<string, { laterality: 'left' | 'right', url: string, region: LabelledMap[] }> = {}
     const registerLayer = (url: string, laterality: 'left' | 'right', region: string, label: number) => {
       if (!threeLabelMap[url]) {
         threeLabelMap[url] = {
           laterality,
-          regions: {},
+          region: [],
           url,
         }
       }
 
-      threeLabelMap[url].regions[region] = label
+      threeLabelMap[url].region.push({
+        name: region,
+        label,
+      })
     }
     for (const regionname in map.indices) {
       for (const { volume: volIdx, fragment, label } of map.indices[regionname]) {
diff --git a/src/atlasComponents/sapi/type_v3.ts b/src/atlasComponents/sapi/typeV3.ts
similarity index 88%
rename from src/atlasComponents/sapi/type_v3.ts
rename to src/atlasComponents/sapi/typeV3.ts
index 89c4e9d8887579a211b938b31cf49d64b10118c7..7aa938fdae4f5496cfdaf06e4e535df633f62f3b 100644
--- a/src/atlasComponents/sapi/type_v3.ts
+++ b/src/atlasComponents/sapi/typeV3.ts
@@ -1,4 +1,4 @@
-import { components, paths, operations } from "./schema_v3"
+import { components, paths, operations } from "./schemaV3"
 
 export type SapiAtlasModel = PathReturn<"/atlases/{atlas_id}">
 export type SapiSpaceModel = PathReturn<"/spaces/{space_id}">
@@ -37,11 +37,3 @@ export type PaginatedModel<T> = {
   page: number
   size: number
 }
-
-/**
- * siibra-explorer types
- * TODO: to be exported
- */
-export type SapiQueryPriorityArg = {
-  priority: number
-}
diff --git a/src/atlasComponents/sapiViews/core/atlas/splashScreen/splashScreen.component.ts b/src/atlasComponents/sapiViews/core/atlas/splashScreen/splashScreen.component.ts
index 50a9a3f9bb4e1123aa8800e437ca07019872529a..442276292251b22b796e4ebe91479ac93b5bde83 100644
--- a/src/atlasComponents/sapiViews/core/atlas/splashScreen/splashScreen.component.ts
+++ b/src/atlasComponents/sapiViews/core/atlas/splashScreen/splashScreen.component.ts
@@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component } from "@angular/core";
 import { Store } from "@ngrx/store";
 import { tap } from 'rxjs/operators'
 import { SAPI } from "src/atlasComponents/sapi/sapi.service";
-import { SxplrAtlas } from "src/atlasComponents/sapi/type_sxplr";
+import { SxplrAtlas } from "src/atlasComponents/sapi/sxplrTypes";
 import { atlasSelection } from "src/state"
 
 @Component({
diff --git a/src/atlasComponents/sapiViews/core/datasets/dataset/dataset.component.ts b/src/atlasComponents/sapiViews/core/datasets/dataset/dataset.component.ts
index 4651fcefd57dc1627a8b1bc8fc1b6f10f7118394..536bb85cb4e53104419e55271047e43f16aebfd3 100644
--- a/src/atlasComponents/sapiViews/core/datasets/dataset/dataset.component.ts
+++ b/src/atlasComponents/sapiViews/core/datasets/dataset/dataset.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from "@angular/core";
-import { Feature } from "src/atlasComponents/sapi/type_sxplr";
+import { Feature } from "src/atlasComponents/sapi/sxplrTypes";
 import { CONST } from "common/constants"
-import { translateV3Entities } from "src/atlasComponents/sapi/translate_v3"
+import { translateV3Entities } from "src/atlasComponents/sapi/translateV3"
 
 const RESTRICTED_ACCESS_ID = "https://nexus.humanbrainproject.org/v0/data/minds/core/embargostatus/v1.0.0/3054f80d-96a8-4dce-9b92-55c68a8b5efd"
 
diff --git a/src/atlasComponents/sapiViews/core/parcellation/filterGroupedParcellations.pipe.ts b/src/atlasComponents/sapiViews/core/parcellation/filterGroupedParcellations.pipe.ts
index b1c5176accb4207091672576307bfc07d74578b7..7436e01bf89832325ea7ff44d65efef29e6ae79c 100644
--- a/src/atlasComponents/sapiViews/core/parcellation/filterGroupedParcellations.pipe.ts
+++ b/src/atlasComponents/sapiViews/core/parcellation/filterGroupedParcellations.pipe.ts
@@ -1,5 +1,5 @@
 import { Pipe, PipeTransform } from "@angular/core";
-import { SxplrParcellation } from "src/atlasComponents/sapi/type_sxplr";
+import { SxplrParcellation } from "src/atlasComponents/sapi/sxplrTypes";
 import { GroupedParcellation } from "./groupedParcellation";
 
 @Pipe({
diff --git a/src/atlasComponents/sapiViews/core/parcellation/filterUnsupportedParc.pipe.ts b/src/atlasComponents/sapiViews/core/parcellation/filterUnsupportedParc.pipe.ts
index 5c80f96bf33e911d5689f4ed263c61fa79bde389..0f3c648ecd17c2520519ab15fc8e9d0a66560899 100644
--- a/src/atlasComponents/sapiViews/core/parcellation/filterUnsupportedParc.pipe.ts
+++ b/src/atlasComponents/sapiViews/core/parcellation/filterUnsupportedParc.pipe.ts
@@ -1,7 +1,7 @@
 import { Pipe, PipeTransform } from "@angular/core";
-import { SxplrParcellation } from "src/atlasComponents/sapi/type_sxplr";
+import { SxplrParcellation } from "src/atlasComponents/sapi/sxplrTypes";
 import { GroupedParcellation } from "./groupedParcellation";
-import { translateV3Entities } from "src/atlasComponents/sapi/translate_v3"
+import { translateV3Entities } from "src/atlasComponents/sapi/translateV3"
 
 type Filterables = SxplrParcellation | GroupedParcellation
 
diff --git a/src/atlasComponents/sapiViews/core/parcellation/groupedParcellation.ts b/src/atlasComponents/sapiViews/core/parcellation/groupedParcellation.ts
index 1f0eb3789fa6ca8ca102a905e9bf24d3be056535..81b5ea8c01a9ae11dab6d7af8cc8bca2e4db8190 100644
--- a/src/atlasComponents/sapiViews/core/parcellation/groupedParcellation.ts
+++ b/src/atlasComponents/sapiViews/core/parcellation/groupedParcellation.ts
@@ -1,4 +1,4 @@
-import { SxplrParcellation } from "src/atlasComponents/sapi/type_sxplr"
+import { SxplrParcellation } from "src/atlasComponents/sapi/sxplrTypes"
 
 export class GroupedParcellation{
   name: string
diff --git a/src/atlasComponents/sapiViews/core/parcellation/parcellationDoi.pipe.ts b/src/atlasComponents/sapiViews/core/parcellation/parcellationDoi.pipe.ts
index 8eba5f152abc68ae63ecd60f6aae9d8517ea2ae8..3b624511a109dc4a9a372cefc9fa020ddd706f7b 100644
--- a/src/atlasComponents/sapiViews/core/parcellation/parcellationDoi.pipe.ts
+++ b/src/atlasComponents/sapiViews/core/parcellation/parcellationDoi.pipe.ts
@@ -1,6 +1,6 @@
 import { Pipe, PipeTransform } from "@angular/core";
-import { SxplrParcellation } from "src/atlasComponents/sapi/type_sxplr";
-import { translateV3Entities } from "src/atlasComponents/sapi/translate_v3"
+import { SxplrParcellation } from "src/atlasComponents/sapi/sxplrTypes";
+import { translateV3Entities } from "src/atlasComponents/sapi/translateV3"
 
 @Pipe({
   name: 'parcellationDoiPipe',
diff --git a/src/atlasComponents/sapiViews/core/parcellation/parcellationGroupSelected.pipe.ts b/src/atlasComponents/sapiViews/core/parcellation/parcellationGroupSelected.pipe.ts
index e73322143f96e2746e040414f599605c5b6db7df..31b8acbe287630ef23e7006e2bbafc3439a9d666 100644
--- a/src/atlasComponents/sapiViews/core/parcellation/parcellationGroupSelected.pipe.ts
+++ b/src/atlasComponents/sapiViews/core/parcellation/parcellationGroupSelected.pipe.ts
@@ -1,5 +1,5 @@
 import { Pipe, PipeTransform } from "@angular/core";
-import { SxplrParcellation } from "src/atlasComponents/sapi/type_sxplr";
+import { SxplrParcellation } from "src/atlasComponents/sapi/sxplrTypes";
 import { GroupedParcellation } from "./groupedParcellation";
 
 function isGroupedParc(parc: GroupedParcellation|unknown): parc is GroupedParcellation {
diff --git a/src/atlasComponents/sapiViews/core/region/region/region.base.directive.ts b/src/atlasComponents/sapiViews/core/region/region/region.base.directive.ts
index ef053700699acbd5655db0739eaba8f4153c43c3..3ed4511d0f8d3ad9bf7c415cb691107c655eb716 100644
--- a/src/atlasComponents/sapiViews/core/region/region/region.base.directive.ts
+++ b/src/atlasComponents/sapiViews/core/region/region/region.base.directive.ts
@@ -1,6 +1,6 @@
 import { Directive, EventEmitter, Input, OnDestroy, Output } from "@angular/core";
-import { SxplrAtlas, SxplrParcellation, SxplrRegion, SxplrTemplate } from "src/atlasComponents/sapi/type_sxplr";
-import { translateV3Entities } from "src/atlasComponents/sapi/translate_v3"
+import { SxplrAtlas, SxplrParcellation, SxplrRegion, SxplrTemplate } from "src/atlasComponents/sapi/sxplrTypes";
+import { translateV3Entities } from "src/atlasComponents/sapi/translateV3"
 import { rgbToHsl } from 'common/util'
 import { SAPI } from "src/atlasComponents/sapi/sapi.service";
 import { BehaviorSubject, Subject } from "rxjs";
diff --git a/src/atlasComponents/sapiViews/core/region/region/region.features.directive.ts b/src/atlasComponents/sapiViews/core/region/region/region.features.directive.ts
index 4dadb9e098aee4f42cf134af7bfe2886f4114a4e..b5629e7fa173ff8e99206c420495bededd3d17f0 100644
--- a/src/atlasComponents/sapiViews/core/region/region/region.features.directive.ts
+++ b/src/atlasComponents/sapiViews/core/region/region/region.features.directive.ts
@@ -2,7 +2,7 @@ import { Directive, OnChanges, SimpleChanges } from "@angular/core";
 import { BehaviorSubject, merge, NEVER } from "rxjs";
 import { switchMap,  filter, startWith, shareReplay, scan } from "rxjs/operators";
 import { SAPI, SAPIRegion } from "src/atlasComponents/sapi";
-import { SxplrAtlas, SxplrParcellation, SxplrTemplate, SxplrRegion } from "src/atlasComponents/sapi/type_sxplr"
+import { SxplrAtlas, SxplrParcellation, SxplrTemplate, SxplrRegion } from "src/atlasComponents/sapi/sxplrTypes"
 import { SapiViewsCoreRegionRegionBase } from "./region.base.directive";
 
 @Directive({
diff --git a/src/atlasComponents/sapiViews/core/region/region/rich/region.rich.component.ts b/src/atlasComponents/sapiViews/core/region/region/rich/region.rich.component.ts
index 02ed169e0ff45ea97188872f01ba56a61018b004..7b0785d5908270c7d8c2d03828d892b7b5ef95de 100644
--- a/src/atlasComponents/sapiViews/core/region/region/rich/region.rich.component.ts
+++ b/src/atlasComponents/sapiViews/core/region/region/rich/region.rich.component.ts
@@ -3,7 +3,7 @@ import { Component, EventEmitter, Inject, Output } from "@angular/core";
 import { DARKTHEME } from "src/util/injectionTokens";
 import { SapiViewsCoreRegionRegionBase } from "../region.base.directive";
 import { ARIA_LABELS, CONST } from 'common/constants'
-import { Feature } from "src/atlasComponents/sapi/type_sxplr";
+import { Feature } from "src/atlasComponents/sapi/sxplrTypes";
 import { SAPI } from "src/atlasComponents/sapi/sapi.service";
 import { environment } from "src/environments/environment";
 
diff --git a/src/atlasComponents/sapiViews/core/rich/ATPSelector/pureDumb/pureATPSelector.components.ts b/src/atlasComponents/sapiViews/core/rich/ATPSelector/pureDumb/pureATPSelector.components.ts
index 4cddf5bde6ac04d647088d4b9370f4e9f489ebba..ef1976937906642f2d5ca1cbf1daea9a89d8d30a 100644
--- a/src/atlasComponents/sapiViews/core/rich/ATPSelector/pureDumb/pureATPSelector.components.ts
+++ b/src/atlasComponents/sapiViews/core/rich/ATPSelector/pureDumb/pureATPSelector.components.ts
@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from "@angular/core";
-import { SxplrAtlas, SxplrParcellation, SxplrTemplate } from "src/atlasComponents/sapi/type_sxplr";
+import { SxplrAtlas, SxplrParcellation, SxplrTemplate } from "src/atlasComponents/sapi/sxplrTypes";
 import { FilterGroupedParcellationPipe, GroupedParcellation } from "src/atlasComponents/sapiViews/core/parcellation";
 
 export const darkThemePalette = [
@@ -22,9 +22,9 @@ export type ATP = {
 
 function isATPGuard(atp: Record<string, unknown>): atp is Partial<ATP> {
   const { atlas, template, parcellation } = atp
-  if (atlas && atlas["@type"] === "juelich/iav/atlas/v1.0.0") return true
-  if (template && template["@type"] === "https://openminds.ebrains.eu/sands/CoordinateSpace") return true
-  if (parcellation && parcellation["@type"] === "minds/core/parcellationatlas/v1.0.0") return true
+  if (atlas && atlas["type"] === "SxplrAtlas") return true
+  if (template && template["type"] === "SxplrTemplate") return true
+  if (parcellation && parcellation["type"] === "SxplrParcellation") return true
   return false
 }
 
diff --git a/src/atlasComponents/sapiViews/core/rich/regionsHierarchy/regionsHierarchy.component.ts b/src/atlasComponents/sapiViews/core/rich/regionsHierarchy/regionsHierarchy.component.ts
index 22b0f837c245c0939431a3751bcccf03b4f742d0..b9212a9079ca3811050e0705fc8d2e5d3a73394b 100644
--- a/src/atlasComponents/sapiViews/core/rich/regionsHierarchy/regionsHierarchy.component.ts
+++ b/src/atlasComponents/sapiViews/core/rich/regionsHierarchy/regionsHierarchy.component.ts
@@ -2,8 +2,8 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, In
 import { UntypedFormControl } from "@angular/forms";
 import { Subscription } from "rxjs";
 import { debounceTime, distinctUntilChanged, filter, startWith } from "rxjs/operators";
-import { SxplrRegion } from "src/atlasComponents/sapi/type_sxplr";
-import { translateV3Entities } from "src/atlasComponents/sapi/translate_v3"
+import { SxplrRegion } from "src/atlasComponents/sapi/sxplrTypes";
+import { translateV3Entities } from "src/atlasComponents/sapi/translateV3"
 import { SxplrFlatHierarchyTreeView } from "src/components/flatHierarchy/treeView/treeView.component";
 import { FilterByRegexPipe } from "./filterByRegex.pipe";
 import { RegionTreeFilterPipe } from "./regionTreeFilter.pipe";
diff --git a/src/atlasComponents/sapiViews/core/rich/regionsListSearch/regionListSearch.component.ts b/src/atlasComponents/sapiViews/core/rich/regionsListSearch/regionListSearch.component.ts
index e455ccc4aa06111b00092198e1ddae87dfbeda5c..b2230eccbe10b41aae3a535d103fa1f39f9e4c05 100644
--- a/src/atlasComponents/sapiViews/core/rich/regionsListSearch/regionListSearch.component.ts
+++ b/src/atlasComponents/sapiViews/core/rich/regionsListSearch/regionListSearch.component.ts
@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component, ContentChild, EventEmitter, Input, Output, TemplateRef } from "@angular/core";
-import { SxplrRegion } from "src/atlasComponents/sapi/type_sxplr";
+import { SxplrRegion } from "src/atlasComponents/sapi/sxplrTypes";
 import { ARIA_LABELS } from "common/constants"
 import { UntypedFormControl } from "@angular/forms";
 import { debounceTime, distinctUntilChanged, map, startWith } from "rxjs/operators";
diff --git a/src/atlasComponents/sapiViews/core/rich/regionsListSearch/regionListSearchTmpl.directive.ts b/src/atlasComponents/sapiViews/core/rich/regionsListSearch/regionListSearchTmpl.directive.ts
index b3efbe51bb910b607ee0940e02e2348990495aef..e254a2cac29660c396cc18c02bb5e06fb648aec4 100644
--- a/src/atlasComponents/sapiViews/core/rich/regionsListSearch/regionListSearchTmpl.directive.ts
+++ b/src/atlasComponents/sapiViews/core/rich/regionsListSearch/regionListSearchTmpl.directive.ts
@@ -1,5 +1,5 @@
 import { Directive, TemplateRef } from "@angular/core";
-import { SxplrRegion } from "src/atlasComponents/sapi/type_sxplr";
+import { SxplrRegion } from "src/atlasComponents/sapi/sxplrTypes";
 
 @Directive({
   selector: 'ng-template[region-template],ng-template[regionTemplate]'
diff --git a/src/atlasComponents/sapiViews/core/space/boundingBox.directive.ts b/src/atlasComponents/sapiViews/core/space/boundingBox.directive.ts
index 0fa95bbbade15e2ea809a6cbfbf2c3ba439e291d..fc5ba9f3f62e5a2c8923a4992b49950fd082af87 100644
--- a/src/atlasComponents/sapiViews/core/space/boundingBox.directive.ts
+++ b/src/atlasComponents/sapiViews/core/space/boundingBox.directive.ts
@@ -1,7 +1,7 @@
 import { Directive, Input, OnChanges, SimpleChanges } from "@angular/core";
 import { BehaviorSubject, Observable } from "rxjs";
 import { distinctUntilChanged } from "rxjs/operators";
-import { BoundingBox, SxplrTemplate, SxplrAtlas } from "src/atlasComponents/sapi/type_sxplr"
+import { BoundingBox, SxplrTemplate, SxplrAtlas } from "src/atlasComponents/sapi/sxplrTypes"
 
 function validateBbox(input: any): boolean {
   if (!Array.isArray(input)) return false
diff --git a/src/atlasComponents/userAnnotations/filterAnnotationBySpace.pipe.ts b/src/atlasComponents/userAnnotations/filterAnnotationBySpace.pipe.ts
index 23f1de2aa3ebbc08ccd76833e270d3fa9c633cbd..006909f05341ef58caddd23e12faedfebbca4507 100644
--- a/src/atlasComponents/userAnnotations/filterAnnotationBySpace.pipe.ts
+++ b/src/atlasComponents/userAnnotations/filterAnnotationBySpace.pipe.ts
@@ -1,6 +1,6 @@
 import { Pipe, PipeTransform } from "@angular/core";
 import { IAnnotationGeometry } from "./tools/type";
-import { SxplrTemplate } from "src/atlasComponents/sapi/type_sxplr"
+import { SxplrTemplate } from "src/atlasComponents/sapi/sxplrTypes"
 
 type TOpts = {
   reverse?: boolean
diff --git a/src/atlasComponents/userAnnotations/tools/service.ts b/src/atlasComponents/userAnnotations/tools/service.ts
index 17d58ebe0dac79780b6ff699885209f9bea7cf7e..5b35420884dd340e0e524bab253e7876aa1cb712 100644
--- a/src/atlasComponents/userAnnotations/tools/service.ts
+++ b/src/atlasComponents/userAnnotations/tools/service.ts
@@ -16,7 +16,7 @@ import { retry } from 'common/util'
 import { MatSnackBar } from "@angular/material/snack-bar";
 import { actions } from "src/state/atlasSelection";
 import { atlasSelection } from "src/state";
-import { SxplrTemplate } from "src/atlasComponents/sapi/type_sxplr";
+import { SxplrTemplate } from "src/atlasComponents/sapi/sxplrTypes";
 import { AnnotationLayer } from "src/atlasComponents/annotations";
 
 const LOCAL_STORAGE_KEY = 'userAnnotationKey'
diff --git a/src/messagingGlue.ts b/src/messagingGlue.ts
index 45a7fb37ef39ad91894b9badaeaf6c461d2e82f5..33506b4852f4774b142bb79d4e7e2916057572bd 100644
--- a/src/messagingGlue.ts
+++ b/src/messagingGlue.ts
@@ -3,7 +3,7 @@ import { Store } from "@ngrx/store";
 import { IMessagingActionTmpl, IWindowMessaging } from "./messaging/types";
 import { atlasAppearance, atlasSelection, generalActions } from "src/state"
 import { SAPI } from "./atlasComponents/sapi";
-import { translateV3Entities } from "./atlasComponents/sapi/translate_v3"
+import { translateV3Entities } from "./atlasComponents/sapi/translateV3"
 
 @Injectable()
 export class MessagingGlue implements IWindowMessaging, OnDestroy {
diff --git a/src/mouseoverModule/util.ts b/src/mouseoverModule/util.ts
index 771b7ae4a5b2717fc6ec34025d06fc969e46c02d..e22552b7c770804a33c4f477056a058e164963fd 100644
--- a/src/mouseoverModule/util.ts
+++ b/src/mouseoverModule/util.ts
@@ -1,4 +1,4 @@
-import { SxplrRegion } from "src/atlasComponents/sapi/type_sxplr"
+import { SxplrRegion } from "src/atlasComponents/sapi/sxplrTypes"
 import { IAnnotationGeometry } from "src/atlasComponents/userAnnotations/tools/type"
 
 export type TOnHoverObj = {
diff --git a/src/routerModule/routeStateTransform.service.ts b/src/routerModule/routeStateTransform.service.ts
index 93b6dd82fac39328caadf1096757b2ab8da54d0b..c1e2460f8eccd65d3e28266a956966ccc3c9161f 100644
--- a/src/routerModule/routeStateTransform.service.ts
+++ b/src/routerModule/routeStateTransform.service.ts
@@ -1,8 +1,10 @@
 import { Injectable } from "@angular/core";
 import { UrlSegment, UrlTree } from "@angular/router";
-import { map } from "rxjs/operators";
+import { forkJoin } from "rxjs";
+import { map, switchMap } from "rxjs/operators";
 import { SAPI } from "src/atlasComponents/sapi";
-import { SxplrRegion } from "src/atlasComponents/sapi/type_sxplr"
+import { translateV3Entities } from "src/atlasComponents/sapi/translateV3";
+import { SxplrRegion } from "src/atlasComponents/sapi/sxplrTypes"
 import { atlasSelection, defaultState, MainState, plugins, userInteraction } from "src/state";
 import { getParcNgId, } from "src/viewerModule/nehuba/config.service";
 import { decodeToNumber, encodeNumber, encodeURIFull, separator } from "./cipher";
@@ -39,45 +41,78 @@ export class RouteStateTransformSvc {
       this.sapi.atlases$.pipe(
         map(atlases => atlases.find(atlas => atlas["@id"] === selectedAtlasId))
       ).toPromise(),
-      this.sapi.getSpaceDetail(selectedAtlasId, selectedTemplateId, { priority: 10 }).toPromise(),
-      this.sapi.getParcDetail(selectedAtlasId, selectedParcellationId, { priority: 10 }).toPromise(),
-      this.sapi.getParcRegions(selectedAtlasId, selectedParcellationId, selectedTemplateId, { priority: 10 }).toPromise(),
+      this.sapi.v3Get("/spaces/{space_id}", {
+        path: {
+          space_id: selectedTemplateId
+        }
+      }).pipe(
+        map(val => translateV3Entities.translateTemplate(val))
+      ).toPromise(),
+      this.sapi.v3Get("/parcellations/{parcellation_id}", {
+        path: {
+          parcellation_id: selectedParcellationId
+        }
+      }).pipe(
+        map(val => translateV3Entities.translateParcellation(val))
+      ).toPromise(),
+      this.sapi.v3Get("/regions", {
+        query: {
+          parcellation_id: selectedParcellationId,
+        }
+      }).pipe(
+        switchMap(v =>
+          this.sapi.iteratePages(v, (page) => this.sapi.v3Get("/regions", {
+            query: {
+              parcellation_id: selectedParcellationId,
+              page
+            }
+          }))
+        ),
+        switchMap(regions => 
+          forkJoin(
+            regions.map(region => translateV3Entities.translateRegion(region))
+          )
+        )
+      ).toPromise(),
     ])
 
-    const ngIdToRegionMap: Map<string, Map<number, SxplrRegion[]>> = new Map()
-
-    for (const region of allParcellationRegions) {
-      const ngId = getParcNgId(selectedAtlas, selectedTemplate, selectedParcellation, region)
-      if (!ngIdToRegionMap.has(ngId)) {
-        ngIdToRegionMap.set(ngId, new Map())
-      }
-      const map = ngIdToRegionMap.get(ngId)
-
-      const idx = await this.sapi.getRegionLabelIndices(selectedTemplate, selectedParcellation, region)
-      if (!map.has(idx)) {
-        map.set(idx, [])
-      }
-      map.get(idx).push(region)
-    }
     
-    const selectedRegions = (() => {
+    const selectedRegions = await (async () => {
       if (!selectedRegionIds) return []
+
       /**
-       * assuming only 1 selected region
-       * if this assumption changes, iterate over array of selectedRegionIds
+       * should account for 
        */
-      const json = { [selectedRegionIds[0]]: selectedRegionIds[1] }
+      const json = {}
 
-      for (const ngId in json) {
-        if (!ngIdToRegionMap.has(ngId)) {
-          console.error(`could not find matching map for ${ngId}`)
+      for (let idx = 0; idx < selectedAtlasId.length; idx += 2) {
+        const stateNgId = selectedRegionIds[idx]
+        if (json[stateNgId]) {
+          console.warn(`ngId '${stateNgId}' appeared multiple times. Skipping. Are the label indicies been stored inefficiently?`)
           continue
         }
+        json[selectedRegionIds[idx]] = selectedRegionIds[idx + 1]
+      }
+      
+      const regionMap = new Map<string, SxplrRegion>(allParcellationRegions.map(region => [region.name, region]))
+      const ngIdToRegionMap: Map<string, Map<number, SxplrRegion[]>> = new Map()
+
+      const [ ngMap, threeMap ] = await Promise.all([
+        this.sapi.getTranslatedLabelledNgMap(selectedParcellation, selectedTemplate),
+        this.sapi.getTranslatedLabelledThreeMap(selectedParcellation, selectedTemplate)
+      ])
 
-        const map = ngIdToRegionMap.get(ngId)
+      const _selectedRegions: SxplrRegion[] = []
+
+      for (const { region } of [...Object.values(ngMap), ...Object.values(threeMap)]) {
+        const actualRegion = regionMap.get(region[0].name)
+        const ngId = getParcNgId(selectedAtlas, selectedTemplate, selectedParcellation, actualRegion)
+
+        if (!json[ngId]) {
+          continue
+        }
         
-        const val = json[ngId]
-        const labelIndicies = val.split(separator).map(n => {
+        const labelIndicies: number[] = json[ngId].split(separator).map((n: string) => {
           try {
             return decodeToNumber(n)
           } catch (e) {
@@ -88,9 +123,22 @@ export class RouteStateTransformSvc {
           }
         }).filter(v => !!v)
 
-        return labelIndicies.map(idx => map.get(idx) || []).flatMap(v => v)
+        _selectedRegions.push(
+          ...region.
+            filter(({ label }) => labelIndicies.includes(label))
+            .map(({ name }) => {
+              
+              const actualRegion = regionMap.get(name)
+              if (!actualRegion) {
+                console.warn(`region name '${name}' cannot be deciphered. Skipping`)
+              }
+              return actualRegion
+            })
+            .filter(v => !!v)
+        )
       }
-      return []
+      return _selectedRegions
+
     })()
 
     return {
diff --git a/src/state/annotations/store.ts b/src/state/annotations/store.ts
index 26a52261bcc69ae39b6bdf549066cea3375b26ef..2dbda5d566a053ad3ac8e38cfaca313a5a8352ef 100644
--- a/src/state/annotations/store.ts
+++ b/src/state/annotations/store.ts
@@ -1,5 +1,5 @@
 import { createReducer, on } from "@ngrx/store"
-import { OpenMINDSCoordinatePoint } from "src/atlasComponents/sapi/type_v3"
+import { OpenMINDSCoordinatePoint } from "src/atlasComponents/sapi/typeV3"
 import * as actions from "./actions"
 
 type Line = {
diff --git a/src/state/atlasAppearance/const.ts b/src/state/atlasAppearance/const.ts
index 32a78b0f0e590411e68adf95ba8cb8f7964bdad3..910acab7a8607b74e5b1a4c5d9d06491145fabe2 100644
--- a/src/state/atlasAppearance/const.ts
+++ b/src/state/atlasAppearance/const.ts
@@ -1,4 +1,4 @@
-import { SxplrRegion } from "src/atlasComponents/sapi/type_sxplr"
+import { SxplrRegion } from "src/atlasComponents/sapi/sxplrTypes"
 export const nameSpace = `[state.atlasAppearance]`
 
 type CustomLayerBase = {
diff --git a/src/state/atlasSelection/actions.ts b/src/state/atlasSelection/actions.ts
index 36e61174c8255944054e02b1da96b9d595789f83..357b6b18162309f39575589304242fc11d500be3 100644
--- a/src/state/atlasSelection/actions.ts
+++ b/src/state/atlasSelection/actions.ts
@@ -1,5 +1,5 @@
 import { createAction, props } from "@ngrx/store";
-import { SxplrAtlas, SxplrParcellation, SxplrRegion, SxplrTemplate } from "src/atlasComponents/sapi/type_sxplr";
+import { SxplrAtlas, SxplrParcellation, SxplrRegion, SxplrTemplate } from "src/atlasComponents/sapi/sxplrTypes";
 import { BreadCrumb, nameSpace, ViewerMode, AtlasSelectionState } from "./const"
 
 export const selectAtlas = createAction(
diff --git a/src/state/atlasSelection/const.ts b/src/state/atlasSelection/const.ts
index b5ad6084ab41a90cce85b4ea182beaa3b8a76a5e..9eacc31e232b91fd79c5df84e70c15b08a5ecbe4 100644
--- a/src/state/atlasSelection/const.ts
+++ b/src/state/atlasSelection/const.ts
@@ -1,4 +1,4 @@
-import { SxplrAtlas, SxplrTemplate, SxplrParcellation, SxplrRegion } from "src/atlasComponents/sapi/type_sxplr"
+import { SxplrAtlas, SxplrTemplate, SxplrParcellation, SxplrRegion } from "src/atlasComponents/sapi/sxplrTypes"
 
 export const nameSpace = `[state.atlasSelection]`
 export type ViewerMode = 'annotating' | 'key frame'
diff --git a/src/state/atlasSelection/effects.ts b/src/state/atlasSelection/effects.ts
index 778aac2ba7c52b6076443166c8819833aed93c76..92442f0794a9c192674b96cf1d5fc855479f6da9 100644
--- a/src/state/atlasSelection/effects.ts
+++ b/src/state/atlasSelection/effects.ts
@@ -10,8 +10,8 @@ import { AtlasSelectionState } from "./const"
 import { atlasAppearance, atlasSelection } from "..";
 
 import { InterSpaceCoordXformSvc } from "src/atlasComponents/sapi/core/space/interSpaceCoordXform.service";
-import { translateV3Entities } from "src/atlasComponents/sapi/translate_v3"
-import { SxplrAtlas, SxplrParcellation, SxplrRegion, SxplrTemplate } from "src/atlasComponents/sapi/type_sxplr";
+import { translateV3Entities } from "src/atlasComponents/sapi/translateV3"
+import { SxplrAtlas, SxplrParcellation, SxplrRegion, SxplrTemplate } from "src/atlasComponents/sapi/sxplrTypes";
 
 type OnTmplParcHookArg = {
   previous: {
@@ -35,18 +35,14 @@ export class Effect {
      * and then set selectedParcellationAllRegions to it
      */
     ({ current }) => {
-      const { atlas, parcellation, template } = current
-      return (
-        !!atlas && !!parcellation && !!template
-          ? this.sapiSvc.getParcRegions(atlas.id, parcellation.id, template.id)
-          : of([])
-      ).pipe(
+      const { parcellation } = current
+      if (!parcellation) return NEVER
+      return this.sapiSvc.getParcRegions(parcellation.id).pipe(
         map(regions => {
           return {
             selectedParcellationAllRegions: regions
           }
-        })
-      )
+        }))
     },
     ({ current, previous }) => {
       const prevSpcName = InterSpaceCoordXformSvc.TmplIdToValidSpaceName(previous?.template?.id)
diff --git a/src/state/atlasSelection/util.ts b/src/state/atlasSelection/util.ts
index 0f21d0095d1456bf7df858d9518a2e7817478035..a76fd1f9f2e8fc45335a5b3695c65bb68322dfef 100644
--- a/src/state/atlasSelection/util.ts
+++ b/src/state/atlasSelection/util.ts
@@ -2,8 +2,8 @@ import { createSelector, select } from "@ngrx/store";
 import { forkJoin, of, pipe } from "rxjs";
 import { distinctUntilChanged, map, switchMap } from "rxjs/operators";
 import { SAPI } from "src/atlasComponents/sapi";
-import { translateV3Entities } from "src/atlasComponents/sapi/translate_v3"
-import { SxplrAtlas, SxplrParcellation, SxplrTemplate } from "src/atlasComponents/sapi/type_sxplr";
+import { translateV3Entities } from "src/atlasComponents/sapi/translateV3"
+import { SxplrAtlas, SxplrParcellation, SxplrTemplate } from "src/atlasComponents/sapi/sxplrTypes";
 import { jsonEqual } from "src/util/json";
 import * as selectors from "./selectors"
 
diff --git a/src/state/userInteraction/actions.ts b/src/state/userInteraction/actions.ts
index 42de09fe8e3100733952564f6fcd18266f5b576a..e6db64e75dcad04c3d2027d0a73ef17d45ab15d5 100644
--- a/src/state/userInteraction/actions.ts
+++ b/src/state/userInteraction/actions.ts
@@ -1,6 +1,6 @@
 import { createAction, props } from "@ngrx/store"
 import { nameSpace } from "./const"
-import { SxplrRegion, Feature, Point } from "src/atlasComponents/sapi/type_sxplr"
+import { SxplrRegion, Feature, Point } from "src/atlasComponents/sapi/sxplrTypes"
 
 export const mouseOverAnnotations = createAction(
   `${nameSpace} mouseOverAnnotations`,
diff --git a/src/state/userInteraction/store.ts b/src/state/userInteraction/store.ts
index 7426ba02eca4f1f5ede5f148ba5e788120bb0061..f6fba659973bf863161f4fd8c79e9b0eee190db6 100644
--- a/src/state/userInteraction/store.ts
+++ b/src/state/userInteraction/store.ts
@@ -1,5 +1,5 @@
 import { createReducer, on } from "@ngrx/store";
-import { SxplrRegion, Feature, Point } from "src/atlasComponents/sapi/type_sxplr";
+import { SxplrRegion, Feature, Point } from "src/atlasComponents/sapi/sxplrTypes";
 import * as actions from "./actions"
 
 export type UserInteraction = {
diff --git a/src/util/fn.ts b/src/util/fn.ts
index b74bf3b0ede872912da6a3bd4ac78a0708ccb1e6..14e561f032012ea44cf5278e963cf84979cabe2c 100644
--- a/src/util/fn.ts
+++ b/src/util/fn.ts
@@ -21,15 +21,6 @@ export function getExportNehuba() {
   return (window as any).export_nehuba
 }
 
-export function getNgIds(regions: any[]): string[] {
-  return regions && regions.map
-    ? regions
-      .map(r => [r.ngId, ...getNgIds(r.children)])
-      .reduce((acc, item) => acc.concat(item), [])
-      .filter(ngId => !!ngId)
-    : []
-}
-
 const recursiveFlatten = (region, {ngId}) => {
   return [{
     ngId,
diff --git a/src/viewerModule/nehuba/base.service/base.service.ts b/src/viewerModule/nehuba/base.service/base.service.ts
index 0e7020fb0cce143b6b52349550c8e7f20e50245f..d53c8efea87daa0fe87abdea24c36d330fd478f2 100644
--- a/src/viewerModule/nehuba/base.service/base.service.ts
+++ b/src/viewerModule/nehuba/base.service/base.service.ts
@@ -1,9 +1,9 @@
 import { Injectable } from "@angular/core";
 import { select, Store } from "@ngrx/store";
-import { from, Observable, pipe, UnaryFunction } from "rxjs";
-import { map, shareReplay, switchMap } from "rxjs/operators";
+import { from, Observable } from "rxjs";
+import { map, switchMap } from "rxjs/operators";
 import { SAPI } from "src/atlasComponents/sapi";
-import { NgSegLayerSpec, SxplrRegion } from "src/atlasComponents/sapi/type_sxplr";
+import { NgSegLayerSpec, SxplrRegion } from "src/atlasComponents/sapi/sxplrTypes";
 import { atlasSelection } from "src/state";
 import { getParcNgId } from "../config.service";
 
@@ -69,19 +69,6 @@ export class BaseService {
     )
   )
 
-
-  public completeNgIdNgSegLayerSpec$: Observable<Record<string, NgSegLayerSpec>> = this.#translatedNgMap.pipe(
-    map(val => {
-      const returnObj: Record<string, NgSegLayerSpec> = {}
-      for (const [ ngId, obj ] of Object.entries(val)) {
-        for (const [_label, layer] of Object.entries(obj)) {
-          returnObj[ngId] = layer.layer
-        }
-      }
-      return returnObj
-    })
-  )
-
   public completeNgIdLabelRegionMap$: Observable<Record<string, Record<number, SxplrRegion>>> = this.#translatedNgMap.pipe(
     map(val => {
       const returnObj: Record<string, Record<number, SxplrRegion>> = {}
diff --git a/src/viewerModule/nehuba/config.service/util.ts b/src/viewerModule/nehuba/config.service/util.ts
index 62cfa5b05d1069f9ee6490e696a193b9ccbb66fd..055c8ed531cde2c96bea43e31ca569984dd7f764 100644
--- a/src/viewerModule/nehuba/config.service/util.ts
+++ b/src/viewerModule/nehuba/config.service/util.ts
@@ -1,4 +1,4 @@
-import { SxplrAtlas, SxplrTemplate, SxplrParcellation, SxplrRegion } from "src/atlasComponents/sapi/type_sxplr"
+import { SxplrAtlas, SxplrTemplate, SxplrParcellation, SxplrRegion } from "src/atlasComponents/sapi/sxplrTypes"
 import { IDS } from 'src/atlasComponents/sapi/constants'
 import { atlasSelection } from 'src/state'
 import { MultiDimMap } from 'src/util/fn'
diff --git a/src/viewerModule/nehuba/constants.ts b/src/viewerModule/nehuba/constants.ts
index ca5ae4be810af998f93318a6348f751555fabff3..03e242246e76227e2e0d0687afa6019b611e298f 100644
--- a/src/viewerModule/nehuba/constants.ts
+++ b/src/viewerModule/nehuba/constants.ts
@@ -1,7 +1,6 @@
 import { InjectionToken } from '@angular/core'
 import { Observable } from 'rxjs'
 
-export { getNgIds } from 'src/util/fn'
 export const NEHUBA_VIEWER_FEATURE_KEY = 'ngViewerFeature'
 
 export interface IRegion {
diff --git a/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.effects.ts b/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.effects.ts
index 1e154fe571454fc953ca217fc88a51ccb4992051..39ddf875d79ecfdec692831dfacfaef290b6505e 100644
--- a/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.effects.ts
+++ b/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.effects.ts
@@ -1,15 +1,15 @@
 import { Injectable } from "@angular/core";
 import { createEffect } from "@ngrx/effects";
 import { select, Store } from "@ngrx/store";
-import { forkJoin, from, of, throwError } from "rxjs";
+import { forkJoin, from, NEVER, of, throwError } from "rxjs";
 import { mapTo, switchMap, withLatestFrom, filter, catchError, map, debounceTime, shareReplay, distinctUntilChanged, startWith, pairwise, tap } from "rxjs/operators";
-import { NgSegLayerSpec, SxplrAtlas, SxplrParcellation, SxplrTemplate } from "src/atlasComponents/sapi/type_sxplr";
+import { NgSegLayerSpec, SxplrAtlas, SxplrParcellation, SxplrTemplate } from "src/atlasComponents/sapi/sxplrTypes";
 import { SAPI } from "src/atlasComponents/sapi"
 import { 
   SapiFeatureModel,
   SapiSpatialFeatureModel,
-} from "src/atlasComponents/sapi/type_v3";
-import { translateV3Entities } from "src/atlasComponents/sapi/translate_v3"
+} from "src/atlasComponents/sapi/typeV3";
+import { translateV3Entities } from "src/atlasComponents/sapi/translateV3"
 import { atlasAppearance, atlasSelection, userInteraction } from "src/state";
 import { arrayEqual } from "src/util/array";
 import { EnumColorMapName } from "src/util/colorMaps";
@@ -36,7 +36,7 @@ export class LayerCtrlEffects {
   onRegionSelectClearPmapLayer = createEffect(() => this.store.pipe(
     select(atlasSelection.selectors.selectedRegions),
     distinctUntilChanged(
-      arrayEqual((o, n) => o["@id"] === n["@id"])
+      arrayEqual((o, n) => o.name === n.name)
     ),
     mapTo(
       atlasAppearance.actions.removeCustomLayer({
@@ -45,40 +45,42 @@ export class LayerCtrlEffects {
     )
   ))
 
+  #pmapUrl: string
   onRegionSelectShowNewPmapLayer = createEffect(() => this.store.pipe(
     select(atlasSelection.selectors.selectedRegions),
-    filter(regions => regions.length > 0),
+    filter(regions => regions.length === 1),
+    map(regions => regions[0]),
+    distinctUntilChanged((ro, rn) => ro.name === rn.name),
     withLatestFrom(
       this.store.pipe(
         atlasSelection.fromRootStore.distinctATP()
       )
     ),
-    switchMap(([ regions, { atlas, parcellation, template } ]) => {
-      return throwError(`IMPLEMENT PMAP LAYER YO`)
-      const actions = [
-        atlasAppearance.actions.addCustomLayer({
-          customLayer: {
-            clType: "customlayer/nglayer",
-            id: PMAP_LAYER_NAME,
-            source: `nifti://${regions['url']}`,
-            shader: getShader({
-              colormap: EnumColorMapName.VIRIDIS,
-              // highThreshold: [regions['']].max,
-              // lowThreshold: [regions['']].min,
-              removeBg: true,
-            })
+    switchMap(([ region, { parcellation, template } ]) => {
+      return this.sapi.getStatisticalMap(parcellation, template, region).pipe(
+        catchError(() => NEVER),
+        map(({ buffer, meta }) => {
+          if (!!this.#pmapUrl) {
+            URL.revokeObjectURL(this.#pmapUrl)
           }
-        }),
-        
-        /**
-         * on error, remove layer
-         */
-        atlasAppearance.actions.removeCustomLayer({
-          id: PMAP_LAYER_NAME
+          this.#pmapUrl = URL.createObjectURL(new Blob([buffer], {type: "application/octet-stream"}))
+          return atlasAppearance.actions.addCustomLayer({
+            customLayer: {
+              clType: "customlayer/nglayer",
+              id: PMAP_LAYER_NAME,
+              source: `nifti://${this.#pmapUrl}`,
+              shader: getShader({
+                colormap: EnumColorMapName.VIRIDIS,
+                highThreshold: meta.max,
+                lowThreshold: meta.min,
+                removeBg: true,
+              })
+            }
+          })
         })
-      ]
+      )
     }),
-  ), { dispatch: false })
+  ))
 
   onATP$ = this.store.pipe(
     atlasSelection.fromRootStore.distinctATP(),
@@ -170,7 +172,8 @@ export class LayerCtrlEffects {
               const ngId = getParcNgId(atlas, template, parcellation, {
                 id: '',
                 name,
-                parentIds: []
+                parentIds: [],
+                type: "SxplrRegion"
               })
               returnVal[ngId] = layer
               continue
diff --git a/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.service.ts b/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.service.ts
index 0281479fbbc03b5f58bacd71a7ce0415009e75f5..3035dc2620c7d1c437e49022f14e12e94fae356e 100644
--- a/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.service.ts
+++ b/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.service.ts
@@ -9,7 +9,7 @@ import { serializeSegment } from "../util";
 import { LayerCtrlEffects } from "./layerCtrl.effects";
 import { arrayEqual } from "src/util/array";
 import { ColorMapCustomLayer } from "src/state/atlasAppearance";
-import { SxplrRegion } from "src/atlasComponents/sapi/type_sxplr";
+import { SxplrRegion } from "src/atlasComponents/sapi/sxplrTypes";
 import { AnnotationLayer } from "src/atlasComponents/annotations";
 import { PMAP_LAYER_NAME } from "../constants"
 import { getShader } from "src/util/constants";
diff --git a/src/viewerModule/nehuba/nehubaViewerGlue/nehubaViewerGlue.component.ts b/src/viewerModule/nehuba/nehubaViewerGlue/nehubaViewerGlue.component.ts
index 10d71071e03fb0abada6f5ded62e1740171daf29..8bcb8567114a8989b98fca2355c0a33864f5a2e7 100644
--- a/src/viewerModule/nehuba/nehubaViewerGlue/nehubaViewerGlue.component.ts
+++ b/src/viewerModule/nehuba/nehubaViewerGlue/nehubaViewerGlue.component.ts
@@ -6,7 +6,7 @@ import { IViewer, TViewerEvent } from "../../viewer.interface";
 import { NehubaMeshService } from "../mesh.service";
 import { NehubaLayerControlService, SET_COLORMAP_OBS, SET_LAYER_VISIBILITY } from "../layerCtrl.service";
 import { NG_LAYER_CONTROL, SET_SEGMENT_VISIBILITY } from "../layerCtrl.service/layerCtrl.util";
-import { SxplrRegion } from "src/atlasComponents/sapi/type_sxplr";
+import { SxplrRegion } from "src/atlasComponents/sapi/sxplrTypes";
 import { NehubaConfig } from "../config.service";
 import { SET_MESHES_TO_LOAD } from "../constants";
 import { atlasSelection, userInteraction } from "src/state";
diff --git a/src/viewerModule/nehuba/nehubaViewerInterface/nehubaViewerInterface.directive.ts b/src/viewerModule/nehuba/nehubaViewerInterface/nehubaViewerInterface.directive.ts
index baa371a0ac122708ea997445cfe0ddf49644f2ab..36738660446e4cb2017bd630889c376d286de6c8 100644
--- a/src/viewerModule/nehuba/nehubaViewerInterface/nehubaViewerInterface.directive.ts
+++ b/src/viewerModule/nehuba/nehubaViewerInterface/nehubaViewerInterface.directive.ts
@@ -9,7 +9,7 @@ import { arrayOfPrimitiveEqual } from 'src/util/fn'
 import { INavObj, NehubaNavigationService } from "../navigation.service";
 import { NehubaConfig, defaultNehubaConfig, getNehubaConfig } from "../config.service";
 import { atlasAppearance, atlasSelection, userPreference } from "src/state";
-import { SxplrAtlas, SxplrParcellation, SxplrTemplate } from "src/atlasComponents/sapi/type_sxplr";
+import { SxplrAtlas, SxplrParcellation, SxplrTemplate } from "src/atlasComponents/sapi/sxplrTypes";
 import { NgLayerCustomLayer } from "src/state/atlasAppearance";
 import { arrayEqual } from "src/util/array";
 import { cvtNavigationObjToNehubaConfig } from "../config.service/util";
diff --git a/src/viewerModule/nehuba/statusCard/statusCard.component.ts b/src/viewerModule/nehuba/statusCard/statusCard.component.ts
index 50fa2c0faddda60c3c47e14cccaee9b760659995..5ca64921a0a7aae9e2bdfd227fe6003bf299ccc3 100644
--- a/src/viewerModule/nehuba/statusCard/statusCard.component.ts
+++ b/src/viewerModule/nehuba/statusCard/statusCard.component.ts
@@ -21,7 +21,7 @@ import { NEHUBA_INSTANCE_INJTKN } from '../util'
 import { IQuickTourData } from "src/ui/quickTour/constrants";
 import { actions } from "src/state/atlasSelection";
 import { atlasSelection } from "src/state";
-import { SxplrTemplate } from "src/atlasComponents/sapi/type_sxplr";
+import { SxplrTemplate } from "src/atlasComponents/sapi/sxplrTypes";
 import { getNehubaConfig } from "../config.service";
 
 @Component({
diff --git a/src/viewerModule/nehuba/types.ts b/src/viewerModule/nehuba/types.ts
index f61a467b37e8427867aab0d938cc6f69df7de3dc..88b6095c5c1a4fa7b653a655cd8d21347c04e15d 100644
--- a/src/viewerModule/nehuba/types.ts
+++ b/src/viewerModule/nehuba/types.ts
@@ -1,4 +1,4 @@
-import { SxplrRegion } from "src/atlasComponents/sapi/type_sxplr";
+import { SxplrRegion } from "src/atlasComponents/sapi/sxplrTypes";
 import { INavObj } from "./navigation.service";
 
 export type TNehubaContextInfo = {
diff --git a/src/viewerModule/nehuba/viewerCtrl/perspectiveViewSlider/perspectiveViewSlider.component.ts b/src/viewerModule/nehuba/viewerCtrl/perspectiveViewSlider/perspectiveViewSlider.component.ts
index 721a27550bc28c11c65c3219fe181a03d20790af..3689ff66a1789d9853002530b3478f9ceb8e559d 100644
--- a/src/viewerModule/nehuba/viewerCtrl/perspectiveViewSlider/perspectiveViewSlider.component.ts
+++ b/src/viewerModule/nehuba/viewerCtrl/perspectiveViewSlider/perspectiveViewSlider.component.ts
@@ -4,7 +4,7 @@ import { select, Store } from "@ngrx/store";
 import { combineLatest, concat, forkJoin, NEVER, Observable, of, Subject, Subscription, throwError } from "rxjs";
 import { switchMap, distinctUntilChanged, map, debounceTime, shareReplay, take, withLatestFrom } from "rxjs/operators";
 import { SAPI } from "src/atlasComponents/sapi";
-import { SxplrTemplate } from "src/atlasComponents/sapi/type_sxplr"
+import { SxplrTemplate } from "src/atlasComponents/sapi/sxplrTypes"
 import { fromRootStore } from "src/state/atlasSelection";
 import { selectedTemplate } from "src/state/atlasSelection/selectors";
 import { panelMode, panelOrder } from "src/state/userInterface/selectors";
diff --git a/src/viewerModule/threeSurfer/store/effects.ts b/src/viewerModule/threeSurfer/store/effects.ts
index cfdf2bfec67eccfec3f5d3de1e5f65c184a0bd0f..55a49c19c868541324ab6957716c9a9ad6ab6224 100644
--- a/src/viewerModule/threeSurfer/store/effects.ts
+++ b/src/viewerModule/threeSurfer/store/effects.ts
@@ -4,7 +4,7 @@ import { select, Store } from "@ngrx/store";
 import { EMPTY, forkJoin, merge, Observable, of, pipe, throwError } from "rxjs";
 import { debounceTime, map, switchMap, withLatestFrom, filter, shareReplay, distinctUntilChanged } from "rxjs/operators";
 import { SAPI } from "src/atlasComponents/sapi";
-import { SxplrAtlas, SxplrParcellation, SxplrTemplate } from "src/atlasComponents/sapi/type_sxplr"
+import { SxplrAtlas, SxplrParcellation, SxplrTemplate } from "src/atlasComponents/sapi/sxplrTypes"
 import { atlasAppearance, atlasSelection } from "src/state";
 import { ThreeSurferCustomLabelLayer, ThreeSurferCustomLayer } from "src/state/atlasAppearance/const";
 import * as selectors from "./selectors"
@@ -118,7 +118,7 @@ export class ThreeSurferEffects {
     switchMap(({ labels, surfaces }) => {
       const labelMaps: ThreeSurferCustomLabelLayer[] = []
       for (const key in labels) {
-        const { laterality, regions, url } = labels[key]
+        const { laterality, url } = labels[key]
         labelMaps.push({
           clType: 'baselayer/threesurfer-label',
           id: `${url}-${laterality}`,
diff --git a/src/viewerModule/threeSurfer/threeSurferGlue/threeSurfer.component.ts b/src/viewerModule/threeSurfer/threeSurferGlue/threeSurfer.component.ts
index a5292817e5b160fa2108e5c5bd62b0eea939c43d..a03768e58f463917aae98d0ba492ef238d96e62f 100644
--- a/src/viewerModule/threeSurfer/threeSurferGlue/threeSurfer.component.ts
+++ b/src/viewerModule/threeSurfer/threeSurferGlue/threeSurfer.component.ts
@@ -11,7 +11,7 @@ import { getUuid } from "src/util/fn";
 import { AUTO_ROTATE, TInteralStatePayload, ViewerInternalStateSvc } from "src/viewerModule/viewerInternalState.service";
 import { atlasAppearance, atlasSelection } from "src/state";
 import { ThreeSurferCustomLabelLayer, ThreeSurferCustomLayer, ColorMapCustomLayer } from "src/state/atlasAppearance/const";
-import { SxplrRegion } from "src/atlasComponents/sapi/type_sxplr"
+import { SxplrRegion } from "src/atlasComponents/sapi/sxplrTypes"
 import { arrayEqual } from "src/util/array";
 import { ThreeSurferEffects } from "../store/effects";
 import { selectors, actions  } from "../store"
diff --git a/src/viewerModule/threeSurfer/types.ts b/src/viewerModule/threeSurfer/types.ts
index 1a4cdf152e08d1b6459a9383e6387e477c85b181..023d307206298a371545b78dac886a46d93d18bc 100644
--- a/src/viewerModule/threeSurfer/types.ts
+++ b/src/viewerModule/threeSurfer/types.ts
@@ -1,4 +1,4 @@
-import { SxplrRegion } from 'src/atlasComponents/sapi/type_sxplr'
+import { SxplrRegion } from 'src/atlasComponents/sapi/sxplrTypes'
 
 export type TThreeSurferMesh = {
   colormap: string
diff --git a/src/viewerModule/viewerCmp/viewerCmp.component.ts b/src/viewerModule/viewerCmp/viewerCmp.component.ts
index 08df7f8b49884a7b094b7152abf21ae7cc398320..db9b4f7e518b9ecb288f041d5ce9c8a1f46653ee 100644
--- a/src/viewerModule/viewerCmp/viewerCmp.component.ts
+++ b/src/viewerModule/viewerCmp/viewerCmp.component.ts
@@ -9,13 +9,13 @@ import { EnumViewerEvt, TContextArg, TSupportedViewers, TViewerEvent } from "../
 import { ContextMenuService, TContextMenuReg } from "src/contextMenuModule";
 import { DialogService } from "src/services/dialogService.service";
 import { SAPI } from "src/atlasComponents/sapi";
-import { Feature, NgLayerSpec, SxplrAtlas, SxplrRegion, TThreeMesh } from "src/atlasComponents/sapi/type_sxplr"
+import { Feature, NgLayerSpec, SxplrAtlas, SxplrRegion, TThreeMesh } from "src/atlasComponents/sapi/sxplrTypes"
 import { atlasSelection, userInteraction } from "src/state";
 
 import { environment } from "src/environments/environment"
 // import { SapiViewsFeaturesVoiQuery } from "src/atlasComponents/sapiViews/features";
 import { SapiViewsCoreSpaceBoundingBox } from "src/atlasComponents/sapiViews/core";
-import { SxplrTemplate } from "src/atlasComponents/sapi/type_sxplr";
+import { SxplrTemplate } from "src/atlasComponents/sapi/sxplrTypes";
 
 @Component({
   selector: 'iav-cmp-viewer-container',
diff --git a/tmpFeatures/receptors/base.ts b/tmpFeatures/receptors/base.ts
index 08dc8f46177f25d1f2071aa76844097eaf746ce6..b3107f4e9b25072fadc873eb71fe1a0c08a3c043 100644
--- a/tmpFeatures/receptors/base.ts
+++ b/tmpFeatures/receptors/base.ts
@@ -1,7 +1,7 @@
 import { Directive, Input, SimpleChanges } from "@angular/core";
 import { BehaviorSubject } from "rxjs";
 import { SAPI, SapiAtlasModel, SapiParcellationModel, SapiRegionModel, SapiSpaceModel } from "src/atlasComponents/sapi";
-import { TabularFeature } from "src/atlasComponents/sapi/type_sxplr"
+import { TabularFeature } from "src/atlasComponents/sapi/sxplrTypes"
 
 @Directive()
 export abstract class BaseReceptor{
diff --git a/tmpFeatures/receptors/fingerprint/fingerprint.component.ts b/tmpFeatures/receptors/fingerprint/fingerprint.component.ts
index 7780f53ad96c8a2fef661008ce83c8c57ffe7165..9c77c20a1e57c4c2b37cbb789b35970454183b54 100644
--- a/tmpFeatures/receptors/fingerprint/fingerprint.component.ts
+++ b/tmpFeatures/receptors/fingerprint/fingerprint.component.ts
@@ -2,7 +2,7 @@ import { AfterViewInit, Component, ElementRef, EventEmitter, HostListener, Injec
 import { fromEvent, Observable, Subscription } from "rxjs";
 import { distinctUntilChanged, map } from "rxjs/operators";
 import { SAPI } from "src/atlasComponents/sapi";
-import { TabularFeature } from "src/atlasComponents/sapi/type_sxplr";
+import { TabularFeature } from "src/atlasComponents/sapi/sxplrTypes";
 import { DARKTHEME } from "src/util/injectionTokens";
 import { BaseReceptor } from "../base";
 
diff --git a/tmpFeatures/voi/voiQuery.directive.ts b/tmpFeatures/voi/voiQuery.directive.ts
index fe76589bdf32503e3b14c6a32b5aabafe0a5d9cb..a9eaab487b18cd27edb0551426852fa948e53383 100644
--- a/tmpFeatures/voi/voiQuery.directive.ts
+++ b/tmpFeatures/voi/voiQuery.directive.ts
@@ -3,7 +3,7 @@ import { interval, merge, Observable, of, Subject, Subscription } from "rxjs";
 import { debounce, debounceTime, distinctUntilChanged, filter, pairwise, shareReplay, startWith, switchMap, take, tap } from "rxjs/operators";
 import { AnnotationLayer, TNgAnnotationPoint, TNgAnnotationAABBox } from "src/atlasComponents/annotations";
 import { SAPI } from "src/atlasComponents/sapi/sapi.service";
-import { BoundingBox, SxplrAtlas, SxplrTemplate, VoiFeature } from "src/atlasComponents/sapi/type_sxplr";
+import { BoundingBox, SxplrAtlas, SxplrTemplate, VoiFeature } from "src/atlasComponents/sapi/sxplrTypes";
 
 import { ClickInterceptor, CLICK_INTERCEPTOR_INJECTOR } from "src/util";
 import { arrayEqual } from "src/util/array";