diff --git a/python/core/qgis.sip b/python/core/qgis.sip
index ad3f1bffa39..b2f9ff87907 100644
--- a/python/core/qgis.sip
+++ b/python/core/qgis.sip
@@ -99,7 +99,7 @@ public:
   /** Magic number for a geographic coord sys in QGIS srs.db tbl_srs.srs_id */
   const long GEOSRS_ID;
   /**  Magic number for a geographic coord sys in EPSG ID format */
-  const long EPSGID;
+  const long GEOEPSG_ID;
   /** The length of teh string "+proj=" */
   const int PROJ_PREFIX_LEN;
   /** The length of teh string "+ellps=" */
diff --git a/src/core/qgis.h b/src/core/qgis.h
index 662b54ca088..2e3b628a9c4 100644
--- a/src/core/qgis.h
+++ b/src/core/qgis.h
@@ -122,7 +122,7 @@ public:
   /** Magic number for a geographic coord sys in QGIS srs.db tbl_srs.srs_id */
   const long GEOSRS_ID = 2585;
   /**  Magic number for a geographic coord sys in EPSG ID format */
-  const long EPSGID = 4326;
+  const long GEOEPSG_ID = 4326;
   /** The length of teh string "+proj=" */
   const int PROJ_PREFIX_LEN = 6;
   /** The length of teh string "+ellps=" */
diff --git a/src/core/qgsdistancearea.cpp b/src/core/qgsdistancearea.cpp
index 0670d28ea2c..14ea8d7d41a 100644
--- a/src/core/qgsdistancearea.cpp
+++ b/src/core/qgsdistancearea.cpp
@@ -43,7 +43,7 @@ QgsDistanceArea::QgsDistanceArea()
   // init with default settings
   mProjectionsEnabled = FALSE;
   mCoordTransform = new QgsCoordinateTransform;
-  setSourceEPSG(EPSGID); // WGS 84
+  setSourceEPSG(GEOEPSG_ID); // WGS 84
   setEllipsoid("WGS84");
 }
 
diff --git a/src/core/qgsmaprenderer.cpp b/src/core/qgsmaprenderer.cpp
index e41e249738d..d6b89f4cefa 100644
--- a/src/core/qgsmaprenderer.cpp
+++ b/src/core/qgsmaprenderer.cpp
@@ -48,7 +48,7 @@ QgsMapRenderer::QgsMapRenderer()
   mSize = QSize(0,0);
   
   mProjectionsEnabled = FALSE;
-  mDestSRS = new QgsSpatialRefSys(EPSGID, QgsSpatialRefSys::EPSG); //WGS 84
+  mDestSRS = new QgsSpatialRefSys(GEOEPSG_ID, QgsSpatialRefSys::EPSG); //WGS 84
 }
 
 QgsMapRenderer::~QgsMapRenderer()
diff --git a/src/core/qgsspatialrefsys.cpp b/src/core/qgsspatialrefsys.cpp
index 80c501bdfac..14b11d58421 100644
--- a/src/core/qgsspatialrefsys.cpp
+++ b/src/core/qgsspatialrefsys.cpp
@@ -953,7 +953,7 @@ bool QgsSpatialRefSys::readXML( QDomNode & theNode )
   else
   {
     // Return default SRS if none was found in the XML.
-    createFromEpsg(EPSGID);
+    createFromEpsg(GEOEPSG_ID);
   }
   return true;
 }