diff --git a/ChangeLog b/ChangeLog
index c8fe995..cf3ec76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
         * Version 1.1.0 released
         =========================
 
+        Rename spatial model components (#1818)
         Fix consistency problem in GCTABackground3D (#1815)
         Models accessing file now support relative file names (#1808)
         Add GXmlElement and GXmlDocument filename() methods (#1808)
diff --git a/NEWS b/NEWS
index 5e21137..ee2bf23 100644
--- a/NEWS
+++ b/NEWS
@@ -217,6 +217,22 @@ The GModelSpatialDiffuseMap, GModelSpatialDiffuseCube and GModelSpectralFunc
 class now support the specifications of file names that are relative to the
 XML file (#1808).
 
+The spatial model components have been renamed to enhance the readability and
+to make them more homogenous. The Fermi/LAT Science Tools should also evolve
+to support the new names:
+* "PointSource" (alias: "SkyDirFunction")
+* "RadialDisk" (alias: "DiskFunction")
+* "RadialGaussian" (alias: "GaussFunction")
+* "RadialShell" (alias: "ShellFunction")
+* "EllipticalDisk"
+* "EllipticalGaussian" (alias: "EllipticalGauss")
+* "DiffuseIsotropic" (alias: "ConstantValue")
+* "DiffuseMap" (alias: "SpatialMap")
+* "DiffuseMapCube" (alias: "MapCubeFunction")
+By default the old model names are still supported. Support of the old model
+names can be turned off by specifying the --disable-legacy-model-names option
+to the ./configure script (#1818).
+
 
 9. Numerics module
 ------------------
diff --git a/configure.ac b/configure.ac
index e796c37..609a075 100644
--- a/configure.ac
+++ b/configure.ac
@@ -699,6 +699,23 @@ fi
 
 
 #############################################################################
+# Checks for Legacy model names option (G_LEGACY_MODEL_NAMES)               #
+#############################################################################
+AC_MSG_CHECKING(whether to enable legacy model names option)
+AC_ARG_ENABLE([legacy_model_names],
+              AS_HELP_STRING([--enable-legacy-model-names],
+                             [enables legacy model names [default=yes]]),
+             [LEGACY_MODEL_NAMES="$enableval"],
+             [LEGACY_MODEL_NAMES="yes"])
+if test "x$LEGACY_MODEL_NAMES" = "xyes"; then
+  AC_DEFINE([G_LEGACY_MODEL_NAMES], [1], [Legacy model names are enabled])
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+fi
+
+
+#############################################################################
 # Checks for Warning option (G_WARNINGS)                                    #
 #############################################################################
 AC_MSG_CHECKING(whether to enable console warnings)
@@ -1560,6 +1577,11 @@ if test "x$SMALL_MEMORY" = "xyes"; then
 else
   echo "  - Optimize memory usage        (no)"
 fi
+if test "x$LEGACY_MODEL_NAMES" = "xyes"; then
+  echo "  * Enable legacy model names    (yes)   (default)"
+else
+  echo "  - Enable legacy model names    (no)"
+fi
 if test "x$enable_openmp" = "xyes"; then
   echo "  * Enable OpenMP                (yes)   (default)"
 else
diff --git a/doc/source/users/user_manual/modules/model.rst b/doc/source/users/user_manual/modules/model.rst
index 7b8ffe0..ecc4687 100644
--- a/doc/source/users/user_manual/modules/model.rst
+++ b/doc/source/users/user_manual/modules/model.rst
@@ -114,7 +114,7 @@ Point source
 .. code-block:: xml
 
   <source name="Crab" type="PointSource">
-    <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>
@@ -129,7 +129,7 @@ Radial disk
 .. code-block:: xml
 
   <source name="Crab" type="ExtendedSource">
-    <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.20"    min="0.01" max="10"  free="1"/>
@@ -145,7 +145,7 @@ Radial Gaussian
 .. code-block:: xml
 
   <source name="Crab" type="ExtendedSource">
-    <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"/>
@@ -161,7 +161,7 @@ Radial shell
 .. code-block:: xml
 
   <source name="Crab" type="ExtendedSource">
-    <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"/>
@@ -196,7 +196,7 @@ Elliptical Gaussian
 .. code-block:: xml
 
   <source name="Crab" type="ExtendedSource">
-    <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"/>
@@ -214,7 +214,7 @@ Isotropic source
 .. code-block:: xml
 
   <source name="Crab" type="DiffuseSource">
-    <spatialModel type="ConstantValue">
+    <spatialModel type="DiffuseIsotropic">
        <parameter name="Value" scale="1" value="1" min="1"  max="1" free="0"/>
     </spatialModel>
     <spectrum type="...">
@@ -228,7 +228,7 @@ Diffuse map
 .. code-block:: xml
 
   <source name="Crab" type="DiffuseSource">
-    <spatialModel type="SpatialMap" file="map.fits">
+    <spatialModel type="DiffuseMap" file="map.fits">
        <parameter name="Prefactor" scale="1" value="1" min="0.001" max="1000.0" free="0"/>
     </spatialModel>
     <spectrum type="...">
@@ -242,7 +242,7 @@ Diffuse map cube
 .. code-block:: xml
 
   <source name="Crab" type="DiffuseSource">
-    <spatialModel type="MapCubeFunction" file="map_cube.fits">
+    <spatialModel type="DiffuseMapCube" file="map_cube.fits">
       <parameter name="Normalization" scale="1" value="1" min="0.001" max="1000.0" free="0"/>
     </spatialModel>
     <spectrum type="...">
diff --git a/examples/cpp/readmodel.cpp b/examples/cpp/readmodel.cpp
index 732e821..3c6182b 100644
--- a/examples/cpp/readmodel.cpp
+++ b/examples/cpp/readmodel.cpp
@@ -56,7 +56,7 @@ void create_xml_file(void)
         file << "    <parameter scale=\"1.0\" name=\"Scale\" min=\"10.0\"";
         file << " max=\"1000000.0\" value=\"100.0\" free=\"0\"/>\n";
         file << "    </spectrum>\n";
-        file << "    <spatialModel type=\"SkyDirFunction\">\n";
+        file << "    <spatialModel type=\"PointSource\">\n";
         file << "      <parameter free=\"0\" max=\"360\" min=\"-360\"";
         file << " name=\"RA\" scale=\"1\" value=\"83.6331\"/>\n";
         file << "      <parameter free=\"0\" max=\"90\" min=\"-90\"";
diff --git a/include/GModelSpatial.hpp b/include/GModelSpatial.hpp
index 73bd91e..3aa2c54 100644
--- a/include/GModelSpatial.hpp
+++ b/include/GModelSpatial.hpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *          GModelSpatial.hpp - Spatial model abstract base class          *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2009-2015 by Juergen Knoedlseder                         *
+ *  copyright (C) 2009-2016 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -86,6 +86,7 @@ public:
     virtual GModelSpatial* clone(void) const = 0;
     virtual std::string    classname(void) const = 0;
     virtual std::string    type(void) const = 0;
+    virtual std::string    alias(void) const = 0;
     virtual GClassCode     code(void) const = 0;
     virtual double         eval(const GPhoton& photon) const = 0;
     virtual double         eval_gradients(const GPhoton& photon) const = 0;
diff --git a/include/GModelSpatialDiffuse.hpp b/include/GModelSpatialDiffuse.hpp
index 2c9ea66..6d12458 100644
--- a/include/GModelSpatialDiffuse.hpp
+++ b/include/GModelSpatialDiffuse.hpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   GModelSpatialDiffuse.hpp - Abstract diffuse spatial model base class  *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2013-2014 by Juergen Knoedlseder                         *
+ *  copyright (C) 2013-2016 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -62,6 +62,7 @@ public:
     virtual GModelSpatialDiffuse* clone(void) const = 0;
     virtual std::string           classname(void) const = 0;
     virtual std::string           type(void) const = 0;
+    virtual std::string           alias(void) const = 0;
     virtual double                eval(const GPhoton& photon) const = 0;
     virtual double                eval_gradients(const GPhoton& photon) const = 0;
     virtual GSkyDir               mc(const GEnergy& energy, const GTime& time,
diff --git a/include/GModelSpatialDiffuseConst.hpp b/include/GModelSpatialDiffuseConst.hpp
index 3351def..03fa7a3 100644
--- a/include/GModelSpatialDiffuseConst.hpp
+++ b/include/GModelSpatialDiffuseConst.hpp
@@ -62,6 +62,7 @@ public:
     virtual GModelSpatialDiffuseConst* clone(void) const;
     virtual std::string                classname(void) const;
     virtual std::string                type(void) const;
+    virtual std::string                alias(void) const;
     virtual double                     eval(const GPhoton& photon) const;
     virtual double                     eval_gradients(const GPhoton& photon) const;
     virtual GSkyDir                    mc(const GEnergy& energy,
@@ -107,13 +108,27 @@ std::string GModelSpatialDiffuseConst::classname(void) const
 /***********************************************************************//**
  * @brief Return spatial model type
  *
- * @return "ConstantValue".
+ * @return "DiffuseIsotropic".
  *
  * Returns the type of the isotropic spatial model.
  ***************************************************************************/
 inline
 std::string GModelSpatialDiffuseConst::type(void) const
 {
+    return "DiffuseIsotropic";
+}
+
+
+/***********************************************************************//**
+ * @brief Return spatial model type alias
+ *
+ * @return "ConstantValue".
+ *
+ * Returns the alias of the isotropic spatial model.
+ ***************************************************************************/
+inline
+std::string GModelSpatialDiffuseConst::alias(void) const
+{
     return "ConstantValue";
 }
 
diff --git a/include/GModelSpatialDiffuseCube.hpp b/include/GModelSpatialDiffuseCube.hpp
index 25ed1d3..4c1d8ea 100644
--- a/include/GModelSpatialDiffuseCube.hpp
+++ b/include/GModelSpatialDiffuseCube.hpp
@@ -77,6 +77,7 @@ public:
     virtual GModelSpatialDiffuseCube* clone(void) const;
     virtual std::string               classname(void) const;
     virtual std::string               type(void) const;
+    virtual std::string               alias(void) const;
     virtual double                    eval(const GPhoton& photon) const;
     virtual double                    eval_gradients(const GPhoton& photon) const;
     virtual GSkyDir                   mc(const GEnergy& energy,
@@ -152,13 +153,27 @@ std::string GModelSpatialDiffuseCube::classname(void) const
 /***********************************************************************//**
  * @brief Return spatial model type
  *
- * @return "MapCubeFunction".
+ * @return "DiffuseMapCube".
  *
  * Returns the type of the spatial map cube model.
  ***************************************************************************/
 inline
 std::string GModelSpatialDiffuseCube::type(void) const
 {
+    return "DiffuseMapCube";
+}
+
+
+/***********************************************************************//**
+ * @brief Return spatial model type alias
+ *
+ * @return "MapCubeFunction".
+ *
+ * Returns the alias of the spatial map cube model.
+ ***************************************************************************/
+inline
+std::string GModelSpatialDiffuseCube::alias(void) const
+{
     return "MapCubeFunction";
 }
 
diff --git a/include/GModelSpatialDiffuseMap.hpp b/include/GModelSpatialDiffuseMap.hpp
index 98682b7..00f72c1 100644
--- a/include/GModelSpatialDiffuseMap.hpp
+++ b/include/GModelSpatialDiffuseMap.hpp
@@ -69,6 +69,7 @@ public:
     virtual GModelSpatialDiffuseMap* clone(void) const;
     virtual std::string              classname(void) const;
     virtual std::string              type(void) const;
+    virtual std::string              alias(void) const;
     virtual double                   eval(const GPhoton& photon) const;
     virtual double                   eval_gradients(const GPhoton& photon) const;
     virtual GSkyDir                  mc(const GEnergy& energy,
@@ -133,13 +134,27 @@ std::string GModelSpatialDiffuseMap::classname(void) const
 /***********************************************************************//**
  * @brief Return spatial model type
  *
- * @return "SpatialMap".
+ * @return "DiffuseMap".
  *
  * Returns the type of the spatial map model.
  ***************************************************************************/
 inline
 std::string GModelSpatialDiffuseMap::type(void) const
 {
+    return "DiffuseMap";
+}
+
+
+/***********************************************************************//**
+ * @brief Return spatial model type alias
+ *
+ * @return "SpatialMap".
+ *
+ * Returns the alias of the spatial map model.
+ ***************************************************************************/
+inline
+std::string GModelSpatialDiffuseMap::alias(void) const
+{
     return "SpatialMap";
 }
 
diff --git a/include/GModelSpatialElliptical.hpp b/include/GModelSpatialElliptical.hpp
index 8ea230a..3d31f4d 100644
--- a/include/GModelSpatialElliptical.hpp
+++ b/include/GModelSpatialElliptical.hpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *  GModelSpatialElliptical.hpp - Abstract elliptical spatial model class  *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2013-2015 by Juergen Knoedlseder                         *
+ *  copyright (C) 2013-2016 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -66,6 +66,7 @@ public:
     virtual GModelSpatialElliptical* clone(void) const = 0;
     virtual std::string              classname(void) const = 0;
     virtual std::string              type(void) const = 0;
+    virtual std::string              alias(void) const = 0;
     virtual double                   eval(const double&  theta,
                                           const double&  posangle,
                                           const GEnergy& energy,
diff --git a/include/GModelSpatialEllipticalDisk.hpp b/include/GModelSpatialEllipticalDisk.hpp
index 29f4446..32b25ea 100644
--- a/include/GModelSpatialEllipticalDisk.hpp
+++ b/include/GModelSpatialEllipticalDisk.hpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   GModelSpatialEllipticalDisk.hpp - Elliptical disk source model class  *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2013-2015 by Michael Mayer                               *
+ *  copyright (C) 2013-2016 by Michael Mayer                               *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -65,6 +65,7 @@ public:
     virtual GModelSpatialEllipticalDisk* clone(void) const;
     virtual std::string                  classname(void) const;
     virtual std::string                  type(void) const;
+    virtual std::string                  alias(void) const;
     virtual double                       eval(const double&  theta,
                                               const double&  posangle,
                                               const GEnergy& energy,
@@ -125,4 +126,18 @@ std::string GModelSpatialEllipticalDisk::type(void) const
     return "EllipticalDisk";
 }
 
+
+/***********************************************************************//**
+ * @brief Return model type alias
+ *
+ * @return "EllipticalDisk".
+ *
+ * Returns the alias of the elliptical disk model.
+ ***************************************************************************/
+inline
+std::string GModelSpatialEllipticalDisk::alias(void) const
+{
+    return "EllipticalDisk";
+}
+
 #endif /* GMODELSPATIALELLIPTICALDISK_HPP */
diff --git a/include/GModelSpatialEllipticalGauss.hpp b/include/GModelSpatialEllipticalGauss.hpp
index af0bf60..bf7fa58 100644
--- a/include/GModelSpatialEllipticalGauss.hpp
+++ b/include/GModelSpatialEllipticalGauss.hpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *  GModelSpatialEllipticalGauss.hpp - Elliptical gauss source model class *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2015 by Michael Mayer                                    *
+ *  copyright (C) 2015-2016 by Michael Mayer                               *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -65,6 +65,7 @@ public:
     virtual GModelSpatialEllipticalGauss* clone(void) const;
     virtual std::string                   classname(void) const;
     virtual std::string                   type(void) const;
+    virtual std::string                   alias(void) const;
     virtual double                        eval(const double&  theta,
                                                const double&  posangle,
                                                const GEnergy& energy,
@@ -125,13 +126,27 @@ std::string GModelSpatialEllipticalGauss::classname(void) const
 /***********************************************************************//**
  * @brief Return model type
  *
- * @return "EllipticalGauss".
+ * @return "EllipticalGaussian".
  *
  * Returns the type of the elliptical gauss model.
  ***************************************************************************/
 inline
 std::string GModelSpatialEllipticalGauss::type(void) const
 {
+    return "EllipticalGaussian";
+}
+
+
+/***********************************************************************//**
+ * @brief Return model type alias
+ *
+ * @return "EllipticalGauss".
+ *
+ * Returns the alias of the elliptical gauss model.
+ ***************************************************************************/
+inline
+std::string GModelSpatialEllipticalGauss::alias(void) const
+{
     return "EllipticalGauss";
 }
 
diff --git a/include/GModelSpatialPointSource.hpp b/include/GModelSpatialPointSource.hpp
index ae761f5..e2af782 100644
--- a/include/GModelSpatialPointSource.hpp
+++ b/include/GModelSpatialPointSource.hpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *     GModelSpatialPointSource.hpp - Spatial point source model class     *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2009-2015 by Juergen Knoedlseder                         *
+ *  copyright (C) 2009-2016 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -65,6 +65,7 @@ public:
     virtual GModelSpatialPointSource* clone(void) const;
     virtual std::string               classname(void) const;
     virtual std::string               type(void) const;
+    virtual std::string               alias(void) const;
     virtual GClassCode                code(void) const;
     virtual double                    eval(const GPhoton& photon) const;
     virtual double                    eval_gradients(const GPhoton& photon) const;
@@ -114,13 +115,27 @@ std::string GModelSpatialPointSource::classname(void) const
 /***********************************************************************//**
  * @brief Return model type
  *
- * @return "SkyDirFunction".
+ * @return "PointSource".
  *
  * Returns the type of the spatial model.
  ***************************************************************************/
 inline
 std::string GModelSpatialPointSource::type(void) const
 {
+    return "PointSource";
+}
+
+
+/***********************************************************************//**
+ * @brief Return model type alias
+ *
+ * @return "SkyDirFunction".
+ *
+ * Returns the alias of the spatial model.
+ ***************************************************************************/
+inline
+std::string GModelSpatialPointSource::alias(void) const
+{
     return "SkyDirFunction";
 }
 
diff --git a/include/GModelSpatialRadial.hpp b/include/GModelSpatialRadial.hpp
index a14038f..e306fd0 100644
--- a/include/GModelSpatialRadial.hpp
+++ b/include/GModelSpatialRadial.hpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *    GModelSpatialRadial.hpp - Abstract radial spatial model base class   *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2011-2015 by Juergen Knoedlseder                         *
+ *  copyright (C) 2011-2016 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -66,6 +66,7 @@ public:
     virtual GModelSpatialRadial* clone(void) const = 0;
     virtual std::string          classname(void) const = 0;
     virtual std::string          type(void) const = 0;
+    virtual std::string          alias(void) const = 0;
     virtual double               eval(const double&  theta,
                                       const GEnergy& energy,
                                       const GTime& time) const = 0;
diff --git a/include/GModelSpatialRadialDisk.hpp b/include/GModelSpatialRadialDisk.hpp
index ed4d615..73e72bf 100644
--- a/include/GModelSpatialRadialDisk.hpp
+++ b/include/GModelSpatialRadialDisk.hpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *      GModelSpatialRadialDisk.hpp - Radial disk source model class       *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2011-2015 by Christoph Deil                              *
+ *  copyright (C) 2011-2016 by Christoph Deil                              *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -62,6 +62,7 @@ public:
     virtual GModelSpatialRadialDisk* clone(void) const;
     virtual std::string              classname(void) const;
     virtual std::string              type(void) const;
+    virtual std::string              alias(void) const;
     virtual double                   eval(const double&  theta,
                                           const GEnergy& energy,
                                           const GTime&   time) const;
@@ -114,13 +115,27 @@ std::string GModelSpatialRadialDisk::classname(void) const
 /***********************************************************************//**
  * @brief Return model type
  *
- * @return "DiskFunction".
+ * @return "RadialDisk".
  *
  * Returns the type of the radial disk model.
  ***************************************************************************/
 inline
 std::string GModelSpatialRadialDisk::type(void) const
 {
+    return "RadialDisk";
+}
+
+
+/***********************************************************************//**
+ * @brief Return model type alias
+ *
+ * @return "DiskFunction".
+ *
+ * Returns the alias of the radial disk model.
+ ***************************************************************************/
+inline
+std::string GModelSpatialRadialDisk::alias(void) const
+{
     return "DiskFunction";
 }
 
diff --git a/include/GModelSpatialRadialGauss.hpp b/include/GModelSpatialRadialGauss.hpp
index 9d834a1..28990aa 100644
--- a/include/GModelSpatialRadialGauss.hpp
+++ b/include/GModelSpatialRadialGauss.hpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *    GModelSpatialRadialGauss.hpp - Radial Gaussian source model class    *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2011-2015 by Juergen Knoedlseder                         *
+ *  copyright (C) 2011-2016 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -63,6 +63,7 @@ public:
     virtual GModelSpatialRadialGauss* clone(void) const;
     virtual std::string               classname(void) const;
     virtual std::string               type(void) const;
+    virtual std::string               alias(void) const;
     virtual double                    eval(const double&  theta,
                                            const GEnergy& energy,
                                            const GTime& time) const;
@@ -109,13 +110,27 @@ std::string GModelSpatialRadialGauss::classname(void) const
 /***********************************************************************//**
  * @brief Return model type
  *
- * @return "GaussFunction".
+ * @return "RadialGaussian".
  *
  * Returns the type of the radial Gauss model.
  ***************************************************************************/
 inline
 std::string GModelSpatialRadialGauss::type(void) const
 {
+    return "RadialGaussian";
+}
+
+
+/***********************************************************************//**
+ * @brief Return model type alias
+ *
+ * @return "GaussFunction".
+ *
+ * Returns the alias of the radial Gauss model.
+ ***************************************************************************/
+inline
+std::string GModelSpatialRadialGauss::alias(void) const
+{
     return "GaussFunction";
 }
 
diff --git a/include/GModelSpatialRadialShell.hpp b/include/GModelSpatialRadialShell.hpp
index f4c489f..01508c2 100644
--- a/include/GModelSpatialRadialShell.hpp
+++ b/include/GModelSpatialRadialShell.hpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *      GModelSpatialRadialShell.hpp - Radial shell source model class     *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2011-2015 by Christoph Deil                              *
+ *  copyright (C) 2011-2016 by Christoph Deil                              *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -74,6 +74,7 @@ public:
     virtual GModelSpatialRadialShell* clone(void) const;
     virtual std::string               classname(void) const;
     virtual std::string               type(void) const;
+    virtual std::string               alias(void) const;
     virtual double                    eval(const double&  theta,
                                            const GEnergy& energy,
                                            const GTime& time) const;
@@ -135,13 +136,27 @@ std::string GModelSpatialRadialShell::classname(void) const
 /***********************************************************************//**
  * @brief Return model type
  *
- * @return "ShellFunction".
+ * @return "RadialShell".
  *
  * Returns the type of the radial shell model.
  ***************************************************************************/
 inline
 std::string GModelSpatialRadialShell::type(void) const
 {
+    return "RadialShell";
+}
+
+
+/***********************************************************************//**
+ * @brief Return model type alias
+ *
+ * @return "ShellFunction".
+ *
+ * Returns the alias of the radial shell model.
+ ***************************************************************************/
+inline
+std::string GModelSpatialRadialShell::alias(void) const
+{
     return "ShellFunction";
 }
 
diff --git a/inst/com/test/data/crab.xml b/inst/com/test/data/crab.xml
index e729c7f..9152bdf 100644
--- a/inst/com/test/data/crab.xml
+++ b/inst/com/test/data/crab.xml
@@ -6,7 +6,7 @@
        <parameter name="Index"     scale="-1"    value="2.05" min="0.0"   max="+5.0"   free="0"/>
        <parameter name="Scale"     scale="1.0"   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="1"/>
       <parameter name="DEC" scale="1.0" value="22.0145" min="-90"  max="90"  free="1"/>
     </spatialModel>
diff --git a/inst/cta/test/data/crab.xml b/inst/cta/test/data/crab.xml
index be48302..8b136bf 100644
--- a/inst/cta/test/data/crab.xml
+++ b/inst/cta/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/inst/cta/test/data/crab_disk.xml b/inst/cta/test/data/crab_disk.xml
index 0d2c05b..bf2d270 100644
--- a/inst/cta/test/data/crab_disk.xml
+++ b/inst/cta/test/data/crab_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.20"    min="0.01" max="10"  free="1"/>
diff --git a/inst/cta/test/data/crab_eplaw.xml b/inst/cta/test/data/crab_eplaw.xml
index 0ec5710..8576983 100644
--- a/inst/cta/test/data/crab_eplaw.xml
+++ b/inst/cta/test/data/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/inst/cta/test/data/crab_file_function.xml b/inst/cta/test/data/crab_file_function.xml
index dc05e10..3eaba1a 100644
--- a/inst/cta/test/data/crab_file_function.xml
+++ b/inst/cta/test/data/crab_file_function.xml
@@ -4,7 +4,7 @@
     <spectrum type="FileFunction" file="crab_file_function.dat">
       <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/inst/cta/test/data/crab_file_function_mod.xml b/inst/cta/test/data/crab_file_function_mod.xml
index 5dfc2ba..0dba311 100644
--- a/inst/cta/test/data/crab_file_function_mod.xml
+++ b/inst/cta/test/data/crab_file_function_mod.xml
@@ -4,7 +4,7 @@
     <spectrum type="FileFunction" file="crab_file_function_mod.dat">
       <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/inst/cta/test/data/crab_gauss.xml b/inst/cta/test/data/crab_gauss.xml
index d93f3ed..446327e 100644
--- a/inst/cta/test/data/crab_gauss.xml
+++ b/inst/cta/test/data/crab_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/inst/cta/test/data/crab_irf.xml b/inst/cta/test/data/crab_irf.xml
index b28e716..238cbaa 100644
--- a/inst/cta/test/data/crab_irf.xml
+++ b/inst/cta/test/data/crab_irf.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/inst/cta/test/data/crab_poly.xml b/inst/cta/test/data/crab_poly.xml
index 81d3ea9..6d1b1f8 100644
--- a/inst/cta/test/data/crab_poly.xml
+++ b/inst/cta/test/data/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/inst/cta/test/data/crab_profile.xml b/inst/cta/test/data/crab_profile.xml
index 38cbb8e..1ffa630 100644
--- a/inst/cta/test/data/crab_profile.xml
+++ b/inst/cta/test/data/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/inst/cta/test/data/crab_ptsrc.xml b/inst/cta/test/data/crab_ptsrc.xml
index dd1014d..066242c 100644
--- a/inst/cta/test/data/crab_ptsrc.xml
+++ b/inst/cta/test/data/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="0"/>
       <parameter name="DEC" scale="1.0" value="22.0145" min="-90"  max="90"  free="0"/>
     </spatialModel>
diff --git a/inst/cta/test/data/crab_shell.xml b/inst/cta/test/data/crab_shell.xml
index bd393b1..83716d0 100644
--- a/inst/cta/test/data/crab_shell.xml
+++ b/inst/cta/test/data/crab_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/inst/cta/test/data/onoff_model.xml b/inst/cta/test/data/onoff_model.xml
index a000e6f..38d32f9 100644
--- a/inst/cta/test/data/onoff_model.xml
+++ b/inst/cta/test/data/onoff_model.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/inst/cta/test/data/radio.xml b/inst/cta/test/data/radio.xml
index de99543..295412f 100644
--- a/inst/cta/test/data/radio.xml
+++ b/inst/cta/test/data/radio.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="radio_map.fits">
+    <spatialModel type="DiffuseMap" file="radio_map.fits">
        <parameter scale="1" name="Prefactor" min="0.001" max="1000.0" value="1" free="0"/>
     </spatialModel>
   </source>
diff --git a/inst/cta/test/data/rsp_models.xml b/inst/cta/test/data/rsp_models.xml
index c9e84ea..af3db6c 100644
--- a/inst/cta/test/data/rsp_models.xml
+++ b/inst/cta/test/data/rsp_models.xml
@@ -6,7 +6,7 @@
             <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="SpatialMap" file="cena_lobes_parkes.fits">
+        <spatialModel type="DiffuseMap" file="cena_lobes_parkes.fits">
             <parameter scale="1" name="Prefactor" min="0.001" max="1000.0" value="1" free="0"/>
         </spatialModel>
     </source>
diff --git a/inst/cta/test/data/stacked_model.xml b/inst/cta/test/data/stacked_model.xml
index d1c6b9f..2889676 100644
--- a/inst/cta/test/data/stacked_model.xml
+++ b/inst/cta/test/data/stacked_model.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/inst/lat/test/data/p6v3/source_model.xml b/inst/lat/test/data/p6v3/source_model.xml
index cd53cdb..6034cc4 100644
--- a/inst/lat/test/data/p6v3/source_model.xml
+++ b/inst/lat/test/data/p6v3/source_model.xml
@@ -3,7 +3,7 @@
     <spectrum type="FileFunction" file="isotropic_iem_v02.txt">
       <parameter scale="1.0" name="Normalization" min="0.0" max="1000.0" value="1.0" free="1"/>
     </spectrum>
-    <spatialModel type="ConstantValue">
+    <spatialModel type="DiffuseIsotropic">
       <parameter scale="1" name="Value" min="0" max="10" value="1" free="0"/>
     </spatialModel>
   </source>
@@ -11,7 +11,7 @@
     <spectrum type="ConstantValue">
       <parameter scale="1.0" name="Value" min="0.0" max="1000.0" value="1.0" free="1"/>
     </spectrum>
-    <spatialModel type="MapCubeFunction" file="test_cube.fits">
+    <spatialModel type="DiffuseMapCube" file="test_cube.fits">
       <parameter scale="1" name="Normalization" min="0.001" max="1000.0" value="1" free="0"/>
     </spatialModel>
   </source>
@@ -22,7 +22,7 @@
       <parameter scale="1.0" name="LowerLimit" min="10.0" max="1000000.0" value="100.0" free="0"/>
       <parameter scale="1.0" name="UpperLimit" min="10.0" max="1000000.0" value="500000.0" free="0"/>
     </spectrum>
-    <spatialModel type="SkyDirFunction">
+    <spatialModel type="PointSource">
       <parameter scale="1" name="RA" min="-360" max="360" value="83.6331" free="0"/>
       <parameter scale="1" name="DEC" min="-90" max="90" value="22.0145" free="0"/>
     </spatialModel>
diff --git a/inst/lat/test/data/p7v6/crab_model.xml b/inst/lat/test/data/p7v6/crab_model.xml
index 4ef655f..3d8af6b 100644
--- a/inst/lat/test/data/p7v6/crab_model.xml
+++ b/inst/lat/test/data/p7v6/crab_model.xml
@@ -3,7 +3,7 @@
     <spectrum type="FileFunction" file="isotrop_2year_P76_source_v0.txt">
       <parameter scale="1.0" name="Normalization" min="0.0" max="1000.0" value="1.0" free="1"/>
     </spectrum>
-    <spatialModel type="ConstantValue">
+    <spatialModel type="DiffuseIsotropic">
       <parameter scale="1" name="Value" min="0" max="10" value="1" free="0"/>
     </spatialModel>
   </source>
@@ -11,7 +11,7 @@
     <spectrum type="ConstantValue">
       <parameter scale="1.0" name="Value" min="0.0" max="1000.0" value="1.0" free="1"/>
     </spectrum>
-    <spatialModel type="MapCubeFunction" file="test_cube.fits">
+    <spatialModel type="DiffuseMapCube" file="test_cube.fits">
       <parameter scale="1" name="Normalization" min="0.001" max="1000.0" value="1" free="0"/>
     </spatialModel>
   </source>
@@ -22,7 +22,7 @@
       <parameter scale="1.0" name="LowerLimit" min="10.0" max="1000000.0" value="100.0" free="0"/>
       <parameter scale="1.0" name="UpperLimit" min="10.0" max="1000000.0" value="500000.0" free="0"/>
     </spectrum>
-    <spatialModel type="SkyDirFunction">
+    <spatialModel type="PointSource">
       <parameter scale="1" name="RA" min="-360" max="360" value="83.6331" free="0"/>
       <parameter scale="1" name="DEC" min="-90" max="90" value="22.0145" free="0"/>
     </spatialModel>
diff --git a/inst/lat/test/data/p7v6/source_model.xml b/inst/lat/test/data/p7v6/source_model.xml
index 4ef655f..3d8af6b 100644
--- a/inst/lat/test/data/p7v6/source_model.xml
+++ b/inst/lat/test/data/p7v6/source_model.xml
@@ -3,7 +3,7 @@
     <spectrum type="FileFunction" file="isotrop_2year_P76_source_v0.txt">
       <parameter scale="1.0" name="Normalization" min="0.0" max="1000.0" value="1.0" free="1"/>
     </spectrum>
-    <spatialModel type="ConstantValue">
+    <spatialModel type="DiffuseIsotropic">
       <parameter scale="1" name="Value" min="0" max="10" value="1" free="0"/>
     </spatialModel>
   </source>
@@ -11,7 +11,7 @@
     <spectrum type="ConstantValue">
       <parameter scale="1.0" name="Value" min="0.0" max="1000.0" value="1.0" free="1"/>
     </spectrum>
-    <spatialModel type="MapCubeFunction" file="test_cube.fits">
+    <spatialModel type="DiffuseMapCube" file="test_cube.fits">
       <parameter scale="1" name="Normalization" min="0.001" max="1000.0" value="1" free="0"/>
     </spatialModel>
   </source>
@@ -22,7 +22,7 @@
       <parameter scale="1.0" name="LowerLimit" min="10.0" max="1000000.0" value="100.0" free="0"/>
       <parameter scale="1.0" name="UpperLimit" min="10.0" max="1000000.0" value="500000.0" free="0"/>
     </spectrum>
-    <spatialModel type="SkyDirFunction">
+    <spatialModel type="PointSource">
       <parameter scale="1" name="RA" min="-360" max="360" value="83.6331" free="0"/>
       <parameter scale="1" name="DEC" min="-90" max="90" value="22.0145" free="0"/>
     </spatialModel>
diff --git a/inst/lat/test/data/p8v2/source_model.xml b/inst/lat/test/data/p8v2/source_model.xml
index 0c702d5..572b396 100644
--- a/inst/lat/test/data/p8v2/source_model.xml
+++ b/inst/lat/test/data/p8v2/source_model.xml
@@ -3,7 +3,7 @@
     <spectrum type="FileFunction" file="iso_P8R2_SOURCE_V6_v06.txt">
       <parameter scale="1.0" name="Normalization" min="0.0" max="1000.0" value="1.0" free="1"/>
     </spectrum>
-    <spatialModel type="ConstantValue">
+    <spatialModel type="DiffuseIsotropic">
       <parameter scale="1" name="Value" min="0" max="10" value="1" free="0"/>
     </spatialModel>
   </source>
@@ -11,7 +11,7 @@
     <spectrum type="ConstantValue">
       <parameter scale="1.0" name="Value" min="0.0" max="1000.0" value="1.0" free="1"/>
     </spectrum>
-    <spatialModel type="MapCubeFunction" file="test_cube.fits">
+    <spatialModel type="DiffuseMapCube" file="test_cube.fits">
       <parameter scale="1" name="Normalization" min="0.001" max="1000.0" value="1" free="0"/>
     </spatialModel>
   </source>
@@ -22,7 +22,7 @@
       <parameter scale="1.0" name="LowerLimit" min="10.0" max="1000000.0" value="100.0" free="0"/>
       <parameter scale="1.0" name="UpperLimit" min="10.0" max="1000000.0" value="500000.0" free="0"/>
     </spectrum>
-    <spatialModel type="SkyDirFunction">
+    <spatialModel type="PointSource">
       <parameter scale="1" name="RA" min="-360" max="360" value="83.6331" free="0"/>
       <parameter scale="1" name="DEC" min="-90" max="90" value="22.0145" free="0"/>
     </spatialModel>
diff --git a/inst/mwl/test/data/crab.xml b/inst/mwl/test/data/crab.xml
index c43fa18..c0b57a7 100644
--- a/inst/mwl/test/data/crab.xml
+++ b/inst/mwl/test/data/crab.xml
@@ -6,7 +6,7 @@
             <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">
+        <spatialModel type="PointSource">
             <parameter free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />
             <parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />
         </spatialModel>
diff --git a/inst/mwl/test/data/crab_mwl.xml b/inst/mwl/test/data/crab_mwl.xml
index c19c3df..268750d 100644
--- a/inst/mwl/test/data/crab_mwl.xml
+++ b/inst/mwl/test/data/crab_mwl.xml
@@ -6,7 +6,7 @@
 			<parameter scale="1.0" name="Index" min="-5.0" max="+5.0" value="-3.0" free="1"/>
 			<parameter scale="1.0" name="Scale" min="1e-07" max="1e20" value="1.0" free="0"/>
 		</spectrum>
-		<spatialModel type="SkyDirFunction">
+		<spatialModel type="PointSource">
 			<parameter free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />
 			<parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />
 		</spatialModel>
@@ -17,7 +17,7 @@
 			<parameter scale="1.0" name="Index" min="-5.0" max="+5.0" value="-1.5" free="1"/>
 			<parameter scale="1.0" name="Scale" min="1e-07" max="1e20" value="1000.0" free="0"/>
 		</spectrum>
-		<spatialModel type="SkyDirFunction">
+		<spatialModel type="PointSource">
 			<parameter free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />
 			<parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />
 		</spatialModel>
diff --git a/inst/mwl/test/data/crab_mwl2.xml b/inst/mwl/test/data/crab_mwl2.xml
index 03c34e9..95c3b71 100644
--- a/inst/mwl/test/data/crab_mwl2.xml
+++ b/inst/mwl/test/data/crab_mwl2.xml
@@ -7,7 +7,7 @@
 			<parameter scale="1.0" name="Cutoff" min="1.0" max="100000.0" value="100.0" free="1"/>
 			<parameter scale="1.0" name="Scale" min="1e-07" max="1e20" value="1.0" free="0"/>
 		</spectrum>
-		<spatialModel type="SkyDirFunction">
+		<spatialModel type="PointSource">
 			<parameter free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />
 			<parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />
 		</spatialModel>
@@ -18,7 +18,7 @@
 			<parameter scale="1.0" name="Index" min="-5.0" max="+5.0" value="-1.2" free="1"/>
 			<parameter scale="1.0" name="Scale" min="1e-07" max="1e20" value="1000.0" free="0"/>
 		</spectrum>
-		<spatialModel type="SkyDirFunction">
+		<spatialModel type="PointSource">
 			<parameter free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />
 			<parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />
 		</spatialModel>
diff --git a/src/model/GModelSpatialDiffuseConst.cpp b/src/model/GModelSpatialDiffuseConst.cpp
index 0e1e7d3..a0373a0 100644
--- a/src/model/GModelSpatialDiffuseConst.cpp
+++ b/src/model/GModelSpatialDiffuseConst.cpp
@@ -410,7 +410,7 @@ double GModelSpatialDiffuseConst::mc_norm(const GSkyDir& dir,
  * Read the isotropic source model information from an XML element. The XML
  * element is expected to have the following format:
  *
- *     <spatialModel type="ConstantValue">
+ *     <spatialModel type="DiffuseIsotropic">
  *       <parameter name="Value" scale="1" value="1" min="1"  max="1" free="0"/>
  *     </spatialModel>
  *
@@ -442,7 +442,7 @@ void GModelSpatialDiffuseConst::read(const GXmlElement& xml)
  * Write the isotropic source model information into an XML element. The XML
  * element will have the following format:
  *
- *     <spatialModel type="ConstantValue">
+ *     <spatialModel type="DiffuseIsotropic">
  *       <parameter name="Value" scale="1" value="1" min="1"  max="1" free="0"/>
  *     </spatialModel>
  *
@@ -451,13 +451,13 @@ void GModelSpatialDiffuseConst::write(GXmlElement& xml) const
 {
     // Set model type
     if (xml.attribute("type") == "") {
-        xml.attribute("type", "ConstantValue");
+        xml.attribute("type", type());
     }
 
     // Verify model type
-    if (xml.attribute("type") != "ConstantValue") {
+    if (xml.attribute("type") != type()) {
         throw GException::model_invalid_spatial(G_WRITE, xml.attribute("type"),
-              "Spatial model is not of type \"ConstantValue\".");
+              "Spatial model is not of type \""+type()+"\".");
     }
 
     // Get or create Value parameter
diff --git a/src/model/GModelSpatialDiffuseCube.cpp b/src/model/GModelSpatialDiffuseCube.cpp
index 65aeee9..a73abce 100644
--- a/src/model/GModelSpatialDiffuseCube.cpp
+++ b/src/model/GModelSpatialDiffuseCube.cpp
@@ -508,13 +508,13 @@ bool GModelSpatialDiffuseCube::contains(const GSkyDir& dir,
  * Read the map cube information from an XML element. The XML element should
  * have either the format
  *
- *     <spatialModel type="MapCubeFunction" file="test_file.fits">
+ *     <spatialModel type="DiffuseMapCube" file="test_file.fits">
  *       <parameter name="Normalization" scale="1" value="1" min="0.1" max="10" free="0"/>
  *     </spatialModel>
  *
  * or alternatively
  *
- *     <spatialModel type="MapCubeFunction" file="test_file.fits">
+ *     <spatialModel type="DiffuseMapCube" file="test_file.fits">
  *       <parameter name="Value" scale="1" value="1" min="0.1" max="10" free="0"/>
  *     </spatialModel>
  *
@@ -568,13 +568,13 @@ void GModelSpatialDiffuseCube::read(const GXmlElement& xml)
  * Write the map cube information into an XML element. The XML element will
  * have either the format
  *
- *     <spatialModel type="MapCubeFunction" file="test_file.fits">
+ *     <spatialModel type="DiffuseMapCube" file="test_file.fits">
  *       <parameter name="Normalization" scale="1" value="1" min="0.1" max="10" free="0"/>
  *     </spatialModel>
  *
  * or alternatively
  *
- *     <spatialModel type="MapCubeFunction" file="test_file.fits">
+ *     <spatialModel type="DiffuseMapCube" file="test_file.fits">
  *       <parameter name="Value" scale="1" value="1" min="0.1" max="10" free="0"/>
  *     </spatialModel>
  *
@@ -584,13 +584,13 @@ void GModelSpatialDiffuseCube::write(GXmlElement& xml) const
 {
     // Set model type
     if (xml.attribute("type") == "") {
-        xml.attribute("type", "MapCubeFunction");
+        xml.attribute("type", type());
     }
 
     // Verify model type
-    if (xml.attribute("type") != "MapCubeFunction") {
+    if (xml.attribute("type") != type()) {
         throw GException::model_invalid_spatial(G_WRITE, xml.attribute("type"),
-              "Spatial model is not of type \"MapCubeFunction\".");
+              "Spatial model is not of type \""+type()+"\".");
     }
 
     // If XML element has 0 nodes then append parameter node. The name
diff --git a/src/model/GModelSpatialDiffuseMap.cpp b/src/model/GModelSpatialDiffuseMap.cpp
index 899d123..43726a1 100644
--- a/src/model/GModelSpatialDiffuseMap.cpp
+++ b/src/model/GModelSpatialDiffuseMap.cpp
@@ -487,13 +487,13 @@ bool GModelSpatialDiffuseMap::contains(const GSkyDir& dir,
  * Reads the spatial information for a diffuse map from an XML element. The
  * expected format of the XML element is
  *
- *     <spatialModel type="SpatialMap" file="myfile.fits" normalize="1">
+ *     <spatialModel type="DiffuseMap" file="myfile.fits" normalize="1">
  *       <parameter name="Prefactor" value="1" min="0.1" max="10" scale="1" free="0"/>
  *     </spatialModel>
  *
  * or
  *
- *     <spatialModel type="SpatialMap" file="myfile.fits" normalize="1">
+ *     <spatialModel type="DiffuseMap" file="myfile.fits" normalize="1">
  *       <parameter name="Normalization" value="1" min="0.1" max="10" scale="1" free="0"/>
  *     </spatialModel>
  *
@@ -563,7 +563,7 @@ void GModelSpatialDiffuseMap::read(const GXmlElement& xml)
  * Writes the spatial information for a diffuse map into an XML element. The
  * format of the XML element is
  *
- *     <spatialModel type="SpatialMap" file="myfile.fits" normalize="1">
+ *     <spatialModel type="DiffuseMap" file="myfile.fits" normalize="1">
  *       <parameter name="Prefactor" value="1" min="0.1" max="10" scale="1" free="0"/>
  *     </spatialModel>
  *
@@ -580,19 +580,19 @@ void GModelSpatialDiffuseMap::write(GXmlElement& xml) const
 {
     // Set model type
     if (xml.attribute("type") == "") {
-        xml.attribute("type", "SpatialMap");
+        xml.attribute("type", type());
     }
 
-    // Set sky map file name
-    //xml.attribute("file", m_filename);
-    xml.attribute("file", gammalib::xml_file_reduce(xml, m_filename));
-
     // Verify model type
-    if (xml.attribute("type") != "SpatialMap") {
+    if (xml.attribute("type") != type()) {
         throw GException::model_invalid_spatial(G_WRITE, xml.attribute("type"),
-              "Spatial model is not of type \"SpatialMap\".");
+              "Spatial model is not of type \""+type()+"\".");
     }
 
+    // Set sky map file name
+    //xml.attribute("file", m_filename);
+    xml.attribute("file", gammalib::xml_file_reduce(xml, m_filename));
+
     // If XML element has 0 nodes then append parameter node. The name
     // of the node is "Prefactor" as this is the Fermi/LAT standard.
     // We thus assure that the XML files will be compatible with
diff --git a/src/model/GModelSpatialEllipticalDisk.cpp b/src/model/GModelSpatialEllipticalDisk.cpp
index e94e344..b009706 100644
--- a/src/model/GModelSpatialEllipticalDisk.cpp
+++ b/src/model/GModelSpatialEllipticalDisk.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   GModelSpatialEllipticalDisk.cpp - Elliptical disk source model class  *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2013-2015 by Michael Mayer                               *
+ *  copyright (C) 2013-2016 by Michael Mayer                               *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -455,7 +455,7 @@ double GModelSpatialEllipticalDisk::theta_max(void) const
  * Reads the elliptical disk model information from an XML element. The XML
  * element shall have either the format 
  *
- *     <spatialModel type="DiskFunction">
+ *     <spatialModel type="EllipticalDisk">
  *       <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"/>
@@ -465,7 +465,7 @@ double GModelSpatialEllipticalDisk::theta_max(void) const
  *
  * or
  *
- *     <spatialModel type="DiskFunction">
+ *     <spatialModel type="EllipticalDisk">
  *       <parameter name="GLON"        scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
  *       <parameter name="GLAT"        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"/>
@@ -544,7 +544,7 @@ void GModelSpatialEllipticalDisk::read(const GXmlElement& xml)
  * Write the elliptical disk model information into an XML element. The XML
  * element will have the format 
  *
- *     <spatialModel type="DiskFunction">
+ *     <spatialModel type="EllipticalDisk">
  *       <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/src/model/GModelSpatialEllipticalGauss.cpp b/src/model/GModelSpatialEllipticalGauss.cpp
index f02757d..97096ee 100644
--- a/src/model/GModelSpatialEllipticalGauss.cpp
+++ b/src/model/GModelSpatialEllipticalGauss.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *  GModelSpatialEllipticalGauss.cpp - Elliptical gauss source model class *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2015 by Michael Mayer                                    *
+ *  copyright (C) 2015-2016 by Michael Mayer                               *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -498,7 +498,7 @@ double GModelSpatialEllipticalGauss::theta_max(void) const
  * Reads the elliptical gauss model information from an XML element. The XML
  * element shall have either the format 
  *
- *     <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"/>
@@ -508,7 +508,7 @@ double GModelSpatialEllipticalGauss::theta_max(void) const
  *
  * or
  *
- *     <spatialModel type="EllipticalGauss">
+ *     <spatialModel type="EllipticalGaussian">
  *       <parameter name="GLON"        scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
  *       <parameter name="GLAT"        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"/>
@@ -587,7 +587,7 @@ void GModelSpatialEllipticalGauss::read(const GXmlElement& xml)
  * Write the elliptical gauss model information into an XML element. The XML
  * element will have the format 
  *
- *     <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/src/model/GModelSpatialPointSource.cpp b/src/model/GModelSpatialPointSource.cpp
index 212d9a6..8f96981 100644
--- a/src/model/GModelSpatialPointSource.cpp
+++ b/src/model/GModelSpatialPointSource.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *     GModelSpatialPointSource.cpp - Spatial point source model class     *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2009-2015 by Juergen Knoedlseder                         *
+ *  copyright (C) 2009-2016 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -341,14 +341,14 @@ bool GModelSpatialPointSource::contains(const GSkyDir& dir,
  * Read the point source information from an XML element with the following
  * format
  *
- *     <spatialModel type="SkyDirFunction">
+ *     <spatialModel type="PointSource">
  *       <parameter free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />
  *       <parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />
  *     </spatialModel>
  *
  * or
  *
- *     <spatialModel type="SkyDirFunction">
+ *     <spatialModel type="PointSource">
  *       <parameter free="0" max="360" min="-360" name="GLON" scale="1" value="83.6331" />
  *       <parameter free="0" max="90" min="-90" name="GLAT" scale="1" value="22.0145" />
  *     </spatialModel>
@@ -427,7 +427,7 @@ void GModelSpatialPointSource::read(const GXmlElement& xml)
  * Write the point source information into an XML element with the following
  * format
  *
- *     <spatialModel type="SkyDirFunction">
+ *     <spatialModel type="PointSource">
  *       <parameter free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />
  *       <parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />
  *     </spatialModel>
diff --git a/src/model/GModelSpatialRadialDisk.cpp b/src/model/GModelSpatialRadialDisk.cpp
index 6caac53..c119ab1 100644
--- a/src/model/GModelSpatialRadialDisk.cpp
+++ b/src/model/GModelSpatialRadialDisk.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *      GModelSpatialRadialDisk.cpp - Radial disk source model class       *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2011-2015 by Christoph Deil                              *
+ *  copyright (C) 2011-2016 by Christoph Deil                              *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -378,7 +378,7 @@ double GModelSpatialRadialDisk::theta_max(void) const
  * Reads the radial disk model information from an XML element. The XML
  * element shall have either the format 
  *
- *     <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"/>
@@ -386,7 +386,7 @@ double GModelSpatialRadialDisk::theta_max(void) const
  *
  * or
  *
- *     <spatialModel type="DiskFunction">
+ *     <spatialModel type="RadialDisk">
  *       <parameter name="GLON"   scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
  *       <parameter name="GLAT"   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"/>
@@ -454,7 +454,7 @@ void GModelSpatialRadialDisk::read(const GXmlElement& xml)
  * Writes the radial disk model information into an XML element. The XML
  * element will have the format 
  *
- *     <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/src/model/GModelSpatialRadialGauss.cpp b/src/model/GModelSpatialRadialGauss.cpp
index 4188a08..2ee7351 100644
--- a/src/model/GModelSpatialRadialGauss.cpp
+++ b/src/model/GModelSpatialRadialGauss.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *    GModelSpatialRadialGauss.cpp - Radial Gaussian source model class    *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2011-2015 by Juergen Knoedlseder                         *
+ *  copyright (C) 2011-2016 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -371,7 +371,7 @@ double GModelSpatialRadialGauss::theta_max(void) const
  * Reads the radial Gauss model information from an XML element. The XML
  * element shall have either the format 
  *
- *     <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.45"    min="0.01" max="10"  free="1"/>
@@ -379,7 +379,7 @@ double GModelSpatialRadialGauss::theta_max(void) const
  *
  * or
  *
- *     <spatialModel type="GaussFunction">
+ *     <spatialModel type="RadialGaussian">
  *       <parameter name="GLON"  scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
  *       <parameter name="GLAT"  scale="1.0" value="22.0145" min="-90"  max="90"  free="1"/>
  *       <parameter name="Sigma" scale="1.0" value="0.45"    min="0.01" max="10"  free="1"/>
@@ -449,7 +449,7 @@ void GModelSpatialRadialGauss::read(const GXmlElement& xml)
  * Writes the radial disk model information into an XML element. The XML
  * element will have the format 
  *
- *     <spatialModel type="DiskFunction">
+ *     <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.45"    min="0.01" max="10"  free="1"/>
diff --git a/src/model/GModelSpatialRadialShell.cpp b/src/model/GModelSpatialRadialShell.cpp
index e934527..df97f06 100644
--- a/src/model/GModelSpatialRadialShell.cpp
+++ b/src/model/GModelSpatialRadialShell.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *      GModelSpatialRadialShell.cpp - Radial shell source model class     *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2011-2015 by Christoph Deil                              *
+ *  copyright (C) 2011-2016 by Christoph Deil                              *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -417,7 +417,7 @@ double GModelSpatialRadialShell::theta_max(void) const
  * Reads the radial shell model information from an XML element. The XML
  * element shall have either the format 
  *
- *     <spatialModel type="DiskFunction">
+ *     <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"/>
@@ -426,7 +426,7 @@ double GModelSpatialRadialShell::theta_max(void) const
  *
  * or
  *
- *     <spatialModel type="DiskFunction">
+ *     <spatialModel type="RadialShell">
  *       <parameter name="GLON"   scale="1.0" value="83.6331" min="-360" max="360" free="1"/>
  *       <parameter name="GLAT"   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"/>
@@ -513,7 +513,7 @@ void GModelSpatialRadialShell::read(const GXmlElement& xml)
  * Writes the radial shell model information into an XML element. The XML
  * element will have the format 
  *
- *     <spatialModel type="DiskFunction">
+ *     <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/src/model/GModelSpatialRegistry.cpp b/src/model/GModelSpatialRegistry.cpp
index ec548e8..28d1859 100644
--- a/src/model/GModelSpatialRegistry.cpp
+++ b/src/model/GModelSpatialRegistry.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *        GModelSpatialRegistry.cpp - Spatial model registry class         *
  * ----------------------------------------------------------------------- *
- *  copyright (C) 2011-2013 by Juergen Knoedlseder                         *
+ *  copyright (C) 2011-2016 by Juergen Knoedlseder                         *
  * ----------------------------------------------------------------------- *
  *                                                                         *
  *  This program is free software: you can redistribute it and/or modify   *
@@ -40,7 +40,7 @@
 /* __ Coding definitions _________________________________________________ */
 
 /* __ Debug definitions __________________________________________________ */
-#define G_DEBUG_REGISTRY 0
+//#define G_DEBUG_REGISTRY        //!< Dump registry
 
 
 /*==========================================================================
@@ -58,7 +58,7 @@ GModelSpatialRegistry::GModelSpatialRegistry(void)
     init_members();
 
     // Debug option: Show actual registry
-    #if G_DEBUG_REGISTRY
+    #if defined(G_DEBUG_REGISTRY)
     std::cout << "GModelSpatialRegistry(void): ";
     for (int i = 0; i < size(); ++i) {
         std::cout << "\"" << names()[i] << "\" ";
@@ -85,14 +85,19 @@ GModelSpatialRegistry::GModelSpatialRegistry(const GModelSpatial* model)
     init_members();
 
     // Debug option: Notify new registry
-    #if G_DEBUG_REGISTRY
+    #if defined(G_DEBUG_REGISTRY)
     std::cout << "GModelSpatialRegistry(const GModelSpatial*): ";
     std::cout << "add \"" << model->type() << "\" to registry." << std::endl;
     #endif
 
     // Allocate new registry
+    #if defined(G_LEGACY_MODEL_NAMES)
+    std::string*          new_names  = new std::string[size()+2];
+    const GModelSpatial** new_models = new const GModelSpatial*[size()+2];
+    #else
     std::string*          new_names  = new std::string[size()+1];
     const GModelSpatial** new_models = new const GModelSpatial*[size()+1];
+    #endif
 
     // Save old registry
     for (int i = 0; i < size(); ++i) {
@@ -104,15 +109,24 @@ GModelSpatialRegistry::GModelSpatialRegistry(const GModelSpatial* model)
     new_names[size()]  = model->type();
     new_models[size()] = model;
 
+    // Add new model with alias to registry for legacy naming convention
+    #if defined(G_LEGACY_MODEL_NAMES)
+    new_names[size()+1]  = model->alias();
+    new_models[size()+1] = model;
+    #endif
+
     // Set pointers on new registry
     names().assign(new_names);
     models().assign(new_models);
 
     // Increment number of models in registry
+    #if defined(G_LEGACY_MODEL_NAMES)
+    number()++;
+    #endif
     number()++;
 
     // Debug option: Show actual registry
-    #if G_DEBUG_REGISTRY
+    #if defined(G_DEBUG_REGISTRY)
     std::cout << "GModelSpatialRegistry(const GModelSpatial*): ";
     for (int i = 0; i < size(); ++i) {
         std::cout << "\"" << names()[i] << "\" ";
diff --git a/test/data/crab.xml b/test/data/crab.xml
index 77953ce..30d79d6 100644
--- a/test/data/crab.xml
+++ b/test/data/crab.xml
@@ -6,7 +6,7 @@
             <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">
+        <spatialModel type="PointSource">
             <parameter free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />
             <parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />
         </spatialModel>
diff --git a/test/data/model_diffuse_const.xml b/test/data/model_diffuse_const.xml
index e4f4653..e610701 100644
--- a/test/data/model_diffuse_const.xml
+++ b/test/data/model_diffuse_const.xml
@@ -6,7 +6,7 @@
 			<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="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/model_diffuse_cube.xml b/test/data/model_diffuse_cube.xml
index 81801d7..49edd23 100644
--- a/test/data/model_diffuse_cube.xml
+++ b/test/data/model_diffuse_cube.xml
@@ -4,7 +4,7 @@
          <spectrum type="ConstantValue">
             <parameter name="Value" scale="1" value="1" min="0" max="1000" free="1"/>
         </spectrum>
-        <spatialModel type="MapCubeFunction" file="test_cube.fits">
+        <spatialModel type="DiffuseMapCube" file="test_cube.fits">
             <parameter name="Normalization" scale="1" value="1" min="0.1" max="10" free="0"/>
         </spatialModel>
 	</source>
diff --git a/test/data/model_diffuse_map.xml b/test/data/model_diffuse_map.xml
index c9e84ea..af3db6c 100644
--- a/test/data/model_diffuse_map.xml
+++ b/test/data/model_diffuse_map.xml
@@ -6,7 +6,7 @@
             <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="SpatialMap" file="cena_lobes_parkes.fits">
+        <spatialModel type="DiffuseMap" file="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/model_elliptical_gauss.xml b/test/data/model_elliptical_gauss.xml
index bcc0a80..54ecb44 100644
--- a/test/data/model_elliptical_gauss.xml
+++ b/test/data/model_elliptical_gauss.xml
@@ -6,7 +6,7 @@
       <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="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/model_point_bplaw.xml b/test/data/model_point_bplaw.xml
index ae87b40..6c9786f 100644
--- a/test/data/model_point_bplaw.xml
+++ b/test/data/model_point_bplaw.xml
@@ -7,7 +7,7 @@
            <parameter name="BreakValue" scale="1e6"   value="0.3"  min="0.01"  max="1000.0" free="1"/>
            <parameter name="Index2"     scale="-1"    value="2.70" min="0.01"  max="+5.0"   free="1"/>
         </spectrum>
-		<spatialModel type="SkyDirFunction">
+		<spatialModel type="PointSource">
 			<parameter free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />
 			<parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />
 		</spatialModel>
diff --git a/test/data/model_point_const.xml b/test/data/model_point_const.xml
index ce7b557..4db7305 100644
--- a/test/data/model_point_const.xml
+++ b/test/data/model_point_const.xml
@@ -4,7 +4,7 @@
         <spectrum type="ConstantValue">
            <parameter name="Normalization" scale="1e-16" value="5.7"  min="1e-07" max="1000.0" free="1"/>
         </spectrum>
-		<spatialModel type="SkyDirFunction">
+		<spatialModel type="PointSource">
 			<parameter free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />
 			<parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />
 		</spatialModel>
diff --git a/test/data/model_point_eplaw.xml b/test/data/model_point_eplaw.xml
index 0a1c237..a087ed1 100644
--- a/test/data/model_point_eplaw.xml
+++ b/test/data/model_point_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 free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />
             <parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />
         </spatialModel>
diff --git a/test/data/model_point_filefct.xml b/test/data/model_point_filefct.xml
index f96a3d5..dfd69ce 100644
--- a/test/data/model_point_filefct.xml
+++ b/test/data/model_point_filefct.xml
@@ -4,7 +4,7 @@
         <spectrum type="FileFunction" file="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 free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />
 			<parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />
 		</spatialModel>
diff --git a/test/data/model_point_gauss.xml b/test/data/model_point_gauss.xml
index b93d4d0..7b4ba3e 100644
--- a/test/data/model_point_gauss.xml
+++ b/test/data/model_point_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 free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />
             <parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />
         </spatialModel>
diff --git a/test/data/model_point_logparabola.xml b/test/data/model_point_logparabola.xml
index 877328e..3ffb995 100644
--- a/test/data/model_point_logparabola.xml
+++ b/test/data/model_point_logparabola.xml
@@ -7,7 +7,7 @@
            <parameter name="Curvature" scale="-1"    value="0.074"   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="SkyDirFunction">
+		<spatialModel type="PointSource">
 			<parameter free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />
 			<parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />
 		</spatialModel>
diff --git a/test/data/model_point_nodes.xml b/test/data/model_point_nodes.xml
index 44588f0..72f5492 100644
--- a/test/data/model_point_nodes.xml
+++ b/test/data/model_point_nodes.xml
@@ -11,7 +11,7 @@
 			    <parameter scale="1e-07" name="Intensity" min="1e-07" max="1000.0" value="0.1"  free="1"/>
             </node>
 		</spectrum>
-		<spatialModel type="SkyDirFunction">
+		<spatialModel type="PointSource">
 			<parameter free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />
 			<parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />
 		</spatialModel>
diff --git a/test/data/model_point_plaw.xml b/test/data/model_point_plaw.xml
index 33cd942..64e227d 100644
--- a/test/data/model_point_plaw.xml
+++ b/test/data/model_point_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 free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />
 			<parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />
 		</spatialModel>
diff --git a/test/data/model_point_plaw2.xml b/test/data/model_point_plaw2.xml
index b744d4a..5fade16 100644
--- a/test/data/model_point_plaw2.xml
+++ b/test/data/model_point_plaw2.xml
@@ -7,7 +7,7 @@
             <parameter scale="1.0"   name="LowerLimit" min="10.0"  max="1000000.0" value="100.0" free="0"/>
             <parameter scale="1.0"   name="UpperLimit" min="10.0"  max="1000000.0" value="500000.0" free="0"/>
         </spectrum>
-		<spatialModel type="SkyDirFunction">
+		<spatialModel type="PointSource">
 			<parameter free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />
 			<parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />
 		</spatialModel>
diff --git a/test/data/model_point_supeplaw.xml b/test/data/model_point_supeplaw.xml
index f87f610..4fc6d3e 100644
--- a/test/data/model_point_supeplaw.xml
+++ b/test/data/model_point_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 free="0" max="360" min="-360" name="RA" scale="1" value="83.6331" />
       <parameter free="0" max="90" min="-90" name="DEC" scale="1" value="22.0145" />
     </spatialModel>
diff --git a/test/data/model_radial_disk.xml b/test/data/model_radial_disk.xml
index 0f8346c..7b622bb 100644
--- a/test/data/model_radial_disk.xml
+++ b/test/data/model_radial_disk.xml
@@ -6,7 +6,7 @@
       <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="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/model_radial_gauss.xml b/test/data/model_radial_gauss.xml
index 7de828f..1c6d39d 100644
--- a/test/data/model_radial_gauss.xml
+++ b/test/data/model_radial_gauss.xml
@@ -6,7 +6,7 @@
       <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="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/model_radial_shell.xml b/test/data/model_radial_shell.xml
index c842f67..00b7a6c 100644
--- a/test/data/model_radial_shell.xml
+++ b/test/data/model_radial_shell.xml
@@ -6,7 +6,7 @@
       <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="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/test.xml b/test/data/test.xml
index 04b6d0f..627d842 100644
--- a/test/data/test.xml
+++ b/test/data/test.xml
@@ -10,7 +10,7 @@
       <parameter free="1" max="100000" min="500" name="Cutoff" scale="1" value="8244.185952" />
       <parameter free="0" max="5" min="0" name="Index2" scale="1" value="1" />
     </spectrum>
-    <spatialModel file="LMC.fits" type="SpatialMap">
+    <spatialModel file="LMC.fits" type="DiffuseMap">
       <parameter free="0" max="1000" min="0.001" name="Prefactor" scale="1" value="1" />
     </spatialModel>
   </source>
diff --git a/test/test_GModel.cpp b/test/test_GModel.cpp
index 088178e..00ad6e1 100644
--- a/test/test_GModel.cpp
+++ b/test/test_GModel.cpp
@@ -531,8 +531,8 @@ void TestGModel::test_point_source(void)
     test_try("Test void constructor");
     try {
         GModelSpatialPointSource model;
-        test_assert(model.type() == "SkyDirFunction",
-                                    "Model type \"SkyDirFunction\" expected.");
+        test_assert(model.type() == "PointSource",
+                                    "Model type \"PointSource\" expected.");
         test_try_success();
     }
     catch (std::exception &e) {
@@ -573,7 +573,7 @@ void TestGModel::test_point_source(void)
         GXmlElement*             element = xml.element(0)->element(0)->element("spatialModel", 0);
         GModelSpatialPointSource model(*element);
         test_value(model.size(), 2);
-        test_assert(model.type() == "SkyDirFunction", "Expected \"SkyDirFunction\"");
+        test_assert(model.type() == "PointSource", "Expected \"PointSource\"");
         test_value(model.ra(), 83.6331);
         test_value(model.dec(), +22.0145);
 
@@ -618,8 +618,8 @@ void TestGModel::test_diffuse_const(void)
     test_try("Test void constructor");
     try {
         GModelSpatialDiffuseConst model;
-        test_assert(model.type() == "ConstantValue",
-                                    "Model type \"ConstantValue\" expected.");
+        test_assert(model.type() == "DiffuseIsotropic",
+                                    "Model type \"DiffuseIsotropic\" expected.");
         test_try_success();
     }
     catch (std::exception &e) {
@@ -645,7 +645,8 @@ void TestGModel::test_diffuse_const(void)
         GXmlElement*              element = xml.element(0)->element(0)->element("spatialModel", 0);
         GModelSpatialDiffuseConst model(*element);
         test_value(model.size(), 1);
-        test_assert(model.type() == "ConstantValue", "Expected \"ConstantValue\"");
+        test_assert(model.type() == "DiffuseIsotropic",
+                    "Expected \"DiffuseIsotropic\"");
         test_value(model.value(), 1.0);
 
         // Test value method
@@ -684,8 +685,8 @@ void TestGModel::test_diffuse_cube(void)
     test_try("Test void constructor");
     try {
         GModelSpatialDiffuseCube model;
-        test_assert(model.type() == "MapCubeFunction",
-                                    "Model type \"MapCubeFunction\" expected.");
+        test_assert(model.type() == "DiffuseMapCube",
+                                    "Model type \"DiffuseMapCube\" expected.");
         test_assert(model.filename().url() == "", "Model filename \"\" expected.");
         test_try_success();
     }
@@ -732,7 +733,8 @@ void TestGModel::test_diffuse_cube(void)
         GXmlElement*             element = xml.element(0)->element(0)->element("spatialModel", 0);
         GModelSpatialDiffuseCube model(*element);
         test_value(model.size(), 1);
-        test_assert(model.type() == "MapCubeFunction", "Expected \"MapCubeFunction\"");
+        test_assert(model.type() == "DiffuseMapCube",
+                    "Expected \"DiffuseMapCube\"");
         test_value(model.value(), 1.0);
         test_assert(model.filename().url() == m_cube_file,
                     "Model filename \""+m_cube_file+"\" expected.");
@@ -780,8 +782,8 @@ void TestGModel::test_diffuse_map(void)
 {
     // Test void constructor
     GModelSpatialDiffuseMap model1;
-    test_assert(model1.type() == "SpatialMap",
-                "Check that model is of type \"SpatialMap\".");
+    test_assert(model1.type() == "DiffuseMap",
+                "Check that model is of type \"DiffuseMap\".");
     test_assert(model1.filename().url() == "",
                 "Check that model has empty filename.");
 
@@ -806,9 +808,9 @@ void TestGModel::test_diffuse_map(void)
     GModelSpatialDiffuseMap model(*elementp);
     test_value(model.size(), 1,
                "Check that model build from an XML element has one parameter.");
-    test_assert(model.type() == "SpatialMap",
+    test_assert(model.type() == "DiffuseMap",
                 "Check that model build from an XML element is of type "
-                "\"SpatialMap\".");
+                "\"DiffuseMap\".");
     test_value(model.value(), 1.0,
                "Check that normalisation of model build from an XML element is "
                "unity.");
@@ -888,8 +890,8 @@ void TestGModel::test_radial_disk(void)
     test_try("Test void constructor");
     try {
         GModelSpatialRadialDisk model;
-        test_assert(model.type() == "DiskFunction",
-                                    "Model type \"DiskFunction\" expected.");
+        test_assert(model.type() == "RadialDisk",
+                                    "Model type \"RadialDisk\" expected.");
         test_try_success();
     }
     catch (std::exception &e) {
@@ -919,7 +921,7 @@ void TestGModel::test_radial_disk(void)
         GXmlElement*            element = xml.element(0)->element(0)->element("spatialModel", 0);
         GModelSpatialRadialDisk model(*element);
         test_value(model.size(), 3);
-        test_assert(model.type() == "DiskFunction", "Expected \"DiskFunction\"");
+        test_assert(model.type() == "RadialDisk", "Expected \"RadialDisk\"");
         test_value(model.ra(), 83.6331);
         test_value(model.dec(), 22.0145);
         test_value(model.radius(), 0.45);
@@ -975,8 +977,8 @@ void TestGModel::test_radial_gauss(void)
     test_try("Test void constructor");
     try {
         GModelSpatialRadialGauss model;
-        test_assert(model.type() == "GaussFunction",
-                                    "Model type \"GaussFunction\" expected.");
+        test_assert(model.type() == "RadialGaussian",
+                                    "Model type \"RadialGaussian\" expected.");
         test_try_success();
     }
     catch (std::exception &e) {
@@ -1006,7 +1008,8 @@ void TestGModel::test_radial_gauss(void)
         GXmlElement*             element = xml.element(0)->element(0)->element("spatialModel", 0);
         GModelSpatialRadialGauss model(*element);
         test_value(model.size(), 3);
-        test_assert(model.type() == "GaussFunction", "Expected \"GaussFunction\"");
+        test_assert(model.type() == "RadialGaussian",
+                    "Expected \"RadialGaussian\"");
         test_value(model.ra(), 83.6331);
         test_value(model.dec(), 22.0145);
         test_value(model.sigma(), 0.20);
@@ -1062,8 +1065,8 @@ void TestGModel::test_radial_shell(void)
     test_try("Test void constructor");
     try {
         GModelSpatialRadialShell model;
-        test_assert(model.type() == "ShellFunction",
-                                    "Model type \"ShellFunction\" expected.");
+        test_assert(model.type() == "RadialShell",
+                                    "Model type \"RadialShell\" expected.");
         test_try_success();
     }
     catch (std::exception &e) {
@@ -1094,7 +1097,7 @@ void TestGModel::test_radial_shell(void)
         GXmlElement*             element = xml.element(0)->element(0)->element("spatialModel", 0);
         GModelSpatialRadialShell model(*element);
         test_value(model.size(), 4);
-        test_assert(model.type() == "ShellFunction", "Expected \"ShellFunction\"");
+        test_assert(model.type() == "RadialShell", "Expected \"RadialShell\"");
         test_value(model.ra(), 83.6331);
         test_value(model.dec(), 22.0145);
         test_value(model.radius(), 0.30);
@@ -1253,8 +1256,8 @@ void TestGModel::test_elliptical_gauss(void)
     test_try("Test void constructor");
     try {
         GModelSpatialEllipticalGauss model;
-        test_assert(model.type() == "EllipticalGauss",
-                                    "Model type \"EllipticalGauss\" expected.");
+        test_assert(model.type() == "EllipticalGaussian",
+                                    "Model type \"EllipticalGaussian\" expected.");
         test_try_success();
     }
     catch (std::exception &e) {
@@ -1286,7 +1289,8 @@ void TestGModel::test_elliptical_gauss(void)
         GXmlElement*                 element = xml.element(0)->element(0)->element("spatialModel", 0);
         GModelSpatialEllipticalGauss model(*element);
         test_value(model.size(), 5);
-        test_assert(model.type() == "EllipticalGauss", "Expected \"EllipticalGauss\"");
+        test_assert(model.type() == "EllipticalGaussian",
+                    "Expected \"EllipticalGaussian\"");
         test_value(model.ra(), 83.6331);
         test_value(model.dec(), 22.0145);
         test_value(model.posangle(), 45.0);
@@ -2633,13 +2637,22 @@ void TestGModel::test_model_registry(void)
         int num = registry.size();
         for (int i = 0; i < num; ++i) {
             GModelSpatial* ptr = registry.alloc(registry.name(i));
-            test_assert(ptr != NULL, "Model pointer for \""+ registry.name(i)+"\" is NULL");
+            test_assert(ptr != NULL,
+                        "Model pointer for \""+ registry.name(i)+"\" is NULL");
             if (ptr != NULL) {
             
                 // Test model type
-                test_assert(ptr->type() == registry.name(i),
+                #if defined(G_LEGACY_MODEL_NAMES)
+                test_assert((ptr->type()  == registry.name(i)) ||
+                            (ptr->alias() == registry.name(i)),
+                            "Expected \""+registry.name(i)+"\" instead"
+                            " of \""+ptr->type()+"\" or \""+
+                            ptr->alias()+"\".");
+                #else
+                test_assert(ptr->type()  == registry.name(i),
                             "Expected \""+registry.name(i)+"\" instead"
                             " of \""+ptr->type()+"\".");
+                #endif
 
                 // Free model
                 delete ptr;