diff --git a/models/crab.xml b/models/crab.xml
index 1130f67..627c43e 100644
--- a/models/crab.xml
+++ b/models/crab.xml
@@ -6,7 +6,7 @@
        <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
        <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="SkyDirFunction">
+    <spatialModel type="PointSource">
       <parameter name="RA"  scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
       <parameter name="DEC" scale="1.0" value="22.0145" min="-90"  max="90"  free="0"/>
     </spatialModel>
diff --git a/models/crab_poly.xml b/models/crab_poly.xml
index 81d3ea9..6d1b1f8 100644
--- a/models/crab_poly.xml
+++ b/models/crab_poly.xml
@@ -6,7 +6,7 @@
        <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
        <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="SkyDirFunction">
+    <spatialModel type="PointSource">
       <parameter name="RA"  scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
       <parameter name="DEC" scale="1.0" value="22.0145" min="-90"  max="90"  free="0"/>
     </spatialModel>
diff --git a/models/crab_profile.xml b/models/crab_profile.xml
index 38cbb8e..1ffa630 100644
--- a/models/crab_profile.xml
+++ b/models/crab_profile.xml
@@ -6,7 +6,7 @@
        <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
        <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="SkyDirFunction">
+    <spatialModel type="PointSource">
       <parameter name="RA"  scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
       <parameter name="DEC" scale="1.0" value="22.0145" min="-90"  max="90"  free="0"/>
     </spatialModel>
diff --git a/models/disk.xml b/models/disk.xml
index cc74775..093198d 100644
--- a/models/disk.xml
+++ b/models/disk.xml
@@ -6,7 +6,7 @@
        <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
        <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="DiskFunction">
+    <spatialModel type="RadialDisk">
       <parameter name="RA"     scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
       <parameter name="DEC"    scale="1.0" value="22.0145" min="-90"  max="90"  free="1"/>
       <parameter name="Radius" scale="1.0" value="0.45"    min="0.01" max="10"  free="1"/>
diff --git a/models/gauss.xml b/models/gauss.xml
index d5058d0..b1da6fe 100644
--- a/models/gauss.xml
+++ b/models/gauss.xml
@@ -6,7 +6,7 @@
        <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
        <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="GaussFunction">
+    <spatialModel type="RadialGaussian">
       <parameter name="RA"    scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
       <parameter name="DEC"   scale="1.0" value="22.0145" min="-90"  max="90"  free="1"/>
       <parameter name="Sigma" scale="1.0" value="0.20"    min="0.01" max="10"  free="1"/>
diff --git a/models/shell.xml b/models/shell.xml
index 775c51b..a13776b 100644
--- a/models/shell.xml
+++ b/models/shell.xml
@@ -6,7 +6,7 @@
        <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
        <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="ShellFunction">
+    <spatialModel type="RadialShell">
       <parameter name="RA"     scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
       <parameter name="DEC"    scale="1.0" value="22.0145" min="-90"  max="90"  free="1"/>
       <parameter name="Radius" scale="1.0" value="0.30"    min="0.01" max="10"  free="1"/>
diff --git a/test/data/crab.xml b/test/data/crab.xml
index c0f7bd1..dbed891 100644
--- a/test/data/crab.xml
+++ b/test/data/crab.xml
@@ -6,7 +6,7 @@
        <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
        <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="SkyDirFunction">
+    <spatialModel type="PointSource">
       <parameter name="RA"  scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
       <parameter name="DEC" scale="1.0" value="22.0145" min="-90"  max="90"  free="0"/>
     </spatialModel>
diff --git a/test/data/crab_bkgcube.xml b/test/data/crab_bkgcube.xml
index d1c6b9f..2889676 100644
--- a/test/data/crab_bkgcube.xml
+++ b/test/data/crab_bkgcube.xml
@@ -6,7 +6,7 @@
       <parameter name="Index" value="2.48" error="0" scale="-1" min="0" max="5" free="1" />
       <parameter name="Scale" value="0.3" scale="1e+06" min="0.01" max="1000" free="0" />
     </spectrum>
-    <spatialModel type="SkyDirFunction">
+    <spatialModel type="PointSource">
       <parameter name="RA" value="83.6331" scale="1" min="-360" max="360" free="0" />
       <parameter name="DEC" value="22.0145" scale="1" min="-90" max="90" free="0" />
     </spatialModel>
diff --git a/test/data/disk.xml b/test/data/disk.xml
index 444c577..ba4a2ea 100644
--- a/test/data/disk.xml
+++ b/test/data/disk.xml
@@ -6,7 +6,7 @@
        <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
        <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="DiskFunction">
+    <spatialModel type="RadialDisk">
       <parameter name="RA"     scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
       <parameter name="DEC"    scale="1.0" value="22.0145" min="-90"  max="90"  free="1"/>
       <parameter name="Radius" scale="1.0" value="0.45"    min="0.01" max="10"  free="1"/>
diff --git a/test/data/gauss.xml b/test/data/gauss.xml
index 6d7066c..2d3fd0d 100644
--- a/test/data/gauss.xml
+++ b/test/data/gauss.xml
@@ -6,7 +6,7 @@
        <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
        <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="GaussFunction">
+    <spatialModel type="RadialGaussian">
       <parameter name="RA"    scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
       <parameter name="DEC"   scale="1.0" value="22.0145" min="-90"  max="90"  free="1"/>
       <parameter name="Sigma" scale="1.0" value="0.20"    min="0.01" max="10"  free="1"/>
diff --git a/test/data/sciver/crab_const.xml b/test/data/sciver/crab_const.xml
index aad1754..2d1a2ac 100644
--- a/test/data/sciver/crab_const.xml
+++ b/test/data/sciver/crab_const.xml
@@ -6,7 +6,7 @@
       <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
       <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="ConstantValue">
+    <spatialModel type="DiffuseIsotropic">
       <parameter name="Value" scale="1" value="1" min="0.1" max="10" free="0"/>
     </spatialModel>
   </source>
diff --git a/test/data/sciver/crab_cube.xml b/test/data/sciver/crab_cube.xml
index 979f1db..bfaafa3 100644
--- a/test/data/sciver/crab_cube.xml
+++ b/test/data/sciver/crab_cube.xml
@@ -6,7 +6,7 @@
       <parameter name="Index"     scale="1.0" value="0.0" min="-5.0"  max="+5.0"   free="1"/>
       <parameter name="Scale"     scale="1e6" value="1.0" min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="MapCubeFunction" file="data/sciver/crab_cube.fits">
+    <spatialModel type="DiffuseMapCube" file="data/sciver/crab_cube.fits">
       <parameter name="Normalization" scale="1" value="1" min="0.1" max="10" free="0"/>
     </spatialModel>
   </source>
diff --git a/test/data/sciver/crab_egauss.xml b/test/data/sciver/crab_egauss.xml
index ee291d4..4e63a01 100644
--- a/test/data/sciver/crab_egauss.xml
+++ b/test/data/sciver/crab_egauss.xml
@@ -6,7 +6,7 @@
       <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
       <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="EllipticalGauss">
+    <spatialModel type="EllipticalGaussian">
       <parameter name="RA"          scale="1.0" value="83.6331" min="-360"  max="360" free="1"/>
       <parameter name="DEC"         scale="1.0" value="22.0145" min="-90"   max="90"  free="1"/>
       <parameter name="PA"          scale="1.0" value="45.0"    min="-360"  max="360" free="1"/>
diff --git a/test/data/sciver/crab_eplaw.xml b/test/data/sciver/crab_eplaw.xml
index 10ab1d8..009241a 100644
--- a/test/data/sciver/crab_eplaw.xml
+++ b/test/data/sciver/crab_eplaw.xml
@@ -7,7 +7,7 @@
       <parameter name="Cutoff"    scale="1e6"   value="1.0"  min="0.01"  max="1000.0" free="1"/>
       <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="SkyDirFunction">
+    <spatialModel type="PointSource">
       <parameter name="RA"  scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
       <parameter name="DEC" scale="1.0" value="22.0145" min="-90"  max="90"  free="0"/>
     </spatialModel>
diff --git a/test/data/sciver/crab_filefct.xml b/test/data/sciver/crab_filefct.xml
index 7072b6c..b7f460b 100644
--- a/test/data/sciver/crab_filefct.xml
+++ b/test/data/sciver/crab_filefct.xml
@@ -4,7 +4,7 @@
     <spectrum type="FileFunction" file="data/sciver/filefunction.txt">
       <parameter scale="1.0" name="Normalization" min="0.0" max="1000.0" value="1.0" free="1"/>
     </spectrum>
-    <spatialModel type="SkyDirFunction">
+    <spatialModel type="PointSource">
       <parameter name="RA"  scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
       <parameter name="DEC" scale="1.0" value="22.0145" min="-90"  max="90"  free="0"/>
     </spatialModel>
diff --git a/test/data/sciver/crab_gauss.xml b/test/data/sciver/crab_gauss.xml
index 30bbc71..0c0d074 100644
--- a/test/data/sciver/crab_gauss.xml
+++ b/test/data/sciver/crab_gauss.xml
@@ -6,7 +6,7 @@
       <parameter name="Mean"          scale="1e6"   value="5.0"  min="0.01"  max="100.0"  free="1"/>
       <parameter name="Sigma"         scale="1e6"   value="1.0"  min="0.01"  max="100.0"  free="1"/>
     </spectrum>
-    <spatialModel type="SkyDirFunction">
+    <spatialModel type="PointSource">
       <parameter name="RA"  scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
       <parameter name="DEC" scale="1.0" value="22.0145" min="-90"  max="90"  free="0"/>
     </spatialModel>
diff --git a/test/data/sciver/crab_logparabola.xml b/test/data/sciver/crab_logparabola.xml
index 4b26c05..b20b09c 100644
--- a/test/data/sciver/crab_logparabola.xml
+++ b/test/data/sciver/crab_logparabola.xml
@@ -7,7 +7,7 @@
       <parameter name="Curvature" scale="-1"    value="0.074" min="0.01"  max="1000.0" free="1"/>
       <parameter name="Scale"     scale="1e6"   value="1.0"   min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="SkyDirFunction">
+    <spatialModel type="PointSource">
       <parameter name="RA"  scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
       <parameter name="DEC" scale="1.0" value="22.0145" min="-90"  max="90"  free="0"/>
     </spatialModel>
diff --git a/test/data/sciver/crab_map.xml b/test/data/sciver/crab_map.xml
index aff473c..8fdcb35 100644
--- a/test/data/sciver/crab_map.xml
+++ b/test/data/sciver/crab_map.xml
@@ -6,7 +6,7 @@
       <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
       <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="SpatialMap" file="data/sciver/cena_lobes_parkes.fits">
+    <spatialModel type="DiffuseMap" file="data/sciver/cena_lobes_parkes.fits">
       <parameter scale="1" name="Prefactor" min="0.001" max="1000.0" value="1" free="0"/>
     </spatialModel>
   </source>
diff --git a/test/data/sciver/crab_map_nn.xml b/test/data/sciver/crab_map_nn.xml
index ef2e0e4..11769d6 100644
--- a/test/data/sciver/crab_map_nn.xml
+++ b/test/data/sciver/crab_map_nn.xml
@@ -6,7 +6,7 @@
       <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
       <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="SpatialMap" file="data/sciver/cena_lobes_parkes.fits" normalize="0">
+    <spatialModel type="DiffuseMap" file="data/sciver/cena_lobes_parkes.fits" normalize="0">
       <parameter scale="1" name="Prefactor" min="0.001" max="1000.0" value="0.3" free="0"/>
     </spatialModel>
   </source>
diff --git a/test/data/sciver/crab_map_roi.xml b/test/data/sciver/crab_map_roi.xml
index aff473c..8fdcb35 100644
--- a/test/data/sciver/crab_map_roi.xml
+++ b/test/data/sciver/crab_map_roi.xml
@@ -6,7 +6,7 @@
       <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
       <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="SpatialMap" file="data/sciver/cena_lobes_parkes.fits">
+    <spatialModel type="DiffuseMap" file="data/sciver/cena_lobes_parkes.fits">
       <parameter scale="1" name="Prefactor" min="0.001" max="1000.0" value="1" free="0"/>
     </spatialModel>
   </source>
diff --git a/test/data/sciver/crab_nodes.xml b/test/data/sciver/crab_nodes.xml
index 316460f..2db71f8 100644
--- a/test/data/sciver/crab_nodes.xml
+++ b/test/data/sciver/crab_nodes.xml
@@ -19,7 +19,7 @@
         <parameter scale="1e-22" name="Intensity" min="1e-07" max="1000.0" value="8.0" free="1"/>
       </node>
     </spectrum>
-    <spatialModel type="SkyDirFunction">
+    <spatialModel type="PointSource">
       <parameter name="RA"  scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
       <parameter name="DEC" scale="1.0" value="22.0145" min="-90"  max="90"  free="0"/>
     </spatialModel>
diff --git a/test/data/sciver/crab_plaw.xml b/test/data/sciver/crab_plaw.xml
index 98207b1..fb122ed 100644
--- a/test/data/sciver/crab_plaw.xml
+++ b/test/data/sciver/crab_plaw.xml
@@ -6,7 +6,7 @@
       <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
       <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="SkyDirFunction">
+    <spatialModel type="PointSource">
       <parameter name="RA"  scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
       <parameter name="DEC" scale="1.0" value="22.0145" min="-90"  max="90"  free="0"/>
     </spatialModel>
diff --git a/test/data/sciver/crab_plaw2.xml b/test/data/sciver/crab_plaw2.xml
index 59afaf8..117eefe 100644
--- a/test/data/sciver/crab_plaw2.xml
+++ b/test/data/sciver/crab_plaw2.xml
@@ -7,7 +7,7 @@
       <parameter name="LowerLimit" scale="1.0"  value="100.0"    min="10.0"  max="1000000.0" free="0"/>
       <parameter name="UpperLimit" scale="1.0"  value="500000.0" min="10.0"  max="1000000.0" free="0"/>
     </spectrum>
-    <spatialModel type="SkyDirFunction">
+    <spatialModel type="PointSource">
       <parameter name="RA"  scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
       <parameter name="DEC" scale="1.0" value="22.0145" min="-90"  max="90"  free="0"/>
     </spatialModel>
diff --git a/test/data/sciver/crab_plaw_edisp.xml b/test/data/sciver/crab_plaw_edisp.xml
index 98207b1..fb122ed 100644
--- a/test/data/sciver/crab_plaw_edisp.xml
+++ b/test/data/sciver/crab_plaw_edisp.xml
@@ -6,7 +6,7 @@
       <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
       <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="SkyDirFunction">
+    <spatialModel type="PointSource">
       <parameter name="RA"  scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
       <parameter name="DEC" scale="1.0" value="22.0145" min="-90"  max="90"  free="0"/>
     </spatialModel>
diff --git a/test/data/sciver/crab_ptsrc.xml b/test/data/sciver/crab_ptsrc.xml
index 7c4b378..f45413b 100644
--- a/test/data/sciver/crab_ptsrc.xml
+++ b/test/data/sciver/crab_ptsrc.xml
@@ -6,7 +6,7 @@
       <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
       <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="SkyDirFunction">
+    <spatialModel type="PointSource">
       <parameter name="RA"  scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
       <parameter name="DEC" scale="1.0" value="22.0145" min="-90"  max="90"  free="1"/>
     </spatialModel>
diff --git a/test/data/sciver/crab_rdisk.xml b/test/data/sciver/crab_rdisk.xml
index 33e66bd..26aaeb8 100644
--- a/test/data/sciver/crab_rdisk.xml
+++ b/test/data/sciver/crab_rdisk.xml
@@ -6,7 +6,7 @@
       <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
       <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="DiskFunction">
+    <spatialModel type="RadialDisk">
       <parameter name="RA"     scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
       <parameter name="DEC"    scale="1.0" value="22.0145" min="-90"  max="90"  free="1"/>
       <parameter name="Radius" scale="1.0" value="0.2"     min="0.01" max="10"  free="1"/>
diff --git a/test/data/sciver/crab_rgauss.xml b/test/data/sciver/crab_rgauss.xml
index a78de6d..aab30ac 100644
--- a/test/data/sciver/crab_rgauss.xml
+++ b/test/data/sciver/crab_rgauss.xml
@@ -6,7 +6,7 @@
       <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
       <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="GaussFunction">
+    <spatialModel type="RadialGaussian">
       <parameter name="RA"    scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
       <parameter name="DEC"   scale="1.0" value="22.0145" min="-90"  max="90"  free="1"/>
       <parameter name="Sigma" scale="1.0" value="0.20"    min="0.01" max="10"  free="1"/>
diff --git a/test/data/sciver/crab_rshell.xml b/test/data/sciver/crab_rshell.xml
index 3231819..3a60206 100644
--- a/test/data/sciver/crab_rshell.xml
+++ b/test/data/sciver/crab_rshell.xml
@@ -6,7 +6,7 @@
       <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
       <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="ShellFunction">
+    <spatialModel type="RadialShell">
       <parameter name="RA"     scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
       <parameter name="DEC"    scale="1.0" value="22.0145" min="-90"  max="90"  free="1"/>
       <parameter name="Radius" scale="1.0" value="0.30"    min="0.01" max="10"  free="1"/>
diff --git a/test/data/sciver/crab_supeplaw.xml b/test/data/sciver/crab_supeplaw.xml
index 495bdf1..c157012 100644
--- a/test/data/sciver/crab_supeplaw.xml
+++ b/test/data/sciver/crab_supeplaw.xml
@@ -8,7 +8,7 @@
       <parameter name="Scale"     scale="1e6"   value="1.0"  min="0.01"  max="1000.0" free="0"/>
       <parameter name="Index2"    scale="1.0"   value="1.5"  min="0.1"   max="5.0"    free="1"/>
     </spectrum>
-    <spatialModel type="SkyDirFunction">
+    <spatialModel type="PointSource">
       <parameter name="RA"  scale="1.0" value="83.6331" min="-360" max="360" free="0"/>
       <parameter name="DEC" scale="1.0" value="22.0145" min="-90"  max="90"  free="0"/>
     </spatialModel>
diff --git a/test/data/shell.xml b/test/data/shell.xml
index 40c52b4..571922a 100644
--- a/test/data/shell.xml
+++ b/test/data/shell.xml
@@ -6,7 +6,7 @@
        <parameter name="Index"     scale="-1"    value="2.48" min="0.0"   max="+5.0"   free="1"/>
        <parameter name="Scale"     scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="0"/>
     </spectrum>
-    <spatialModel type="ShellFunction">
+    <spatialModel type="RadialShell">
       <parameter name="RA"     scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
       <parameter name="DEC"    scale="1.0" value="22.0145" min="-90"  max="90"  free="1"/>
       <parameter name="Radius" scale="1.0" value="0.30"    min="0.01" max="10"  free="1"/>
diff --git a/test/data/source1.xml b/test/data/source1.xml
index cffa4fc..ed5ab84 100644
--- a/test/data/source1.xml
+++ b/test/data/source1.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" standalone="no"?>
 <source_library title="source library">
-        <source name="Source1" type="PointSource">
-                <spectrum type="PowerLaw">
-                        <parameter scale="1e-07" name="Prefactor" min="1e-07" max="1000.0" value="1.0" free="1"/>
-                        <parameter scale="1.0" name="Index" min="-5.0" max="+5.0" value="-2.1" free="1"/>
-                        <parameter scale="1.0" name="Scale" min="10.0" max="1000000.0" value="100.0" free="0"/>
-                </spectrum>
-                <spatialModel type="SkyDirFunction">
-                        <parameter free="0" max="360" min="-360" name="RA" scale="1" value="117.0" />
-                        <parameter free="0" max="90" min="-90" name="DEC" scale="1" value="-33.0" />
-                </spatialModel>
-        </source>
+    <source name="Source1" type="PointSource">
+        <spectrum type="PowerLaw">
+            <parameter scale="1e-07" name="Prefactor" min="1e-07" max="1000.0" value="1.0" free="1"/>
+            <parameter scale="1.0" name="Index" min="-5.0" max="+5.0" value="-2.1" free="1"/>
+            <parameter scale="1.0" name="Scale" min="10.0" max="1000000.0" value="100.0" free="0"/>
+        </spectrum>
+        <spatialModel type="PointSource">
+            <parameter free="0" max="360" min="-360" name="RA" scale="1" value="117.0" />
+            <parameter free="0" max="90" min="-90" name="DEC" scale="1" value="-33.0" />
+        </spatialModel>
+    </source>
 </source_library>