diff --git a/demo/c++/SConscript b/demo/c++/SConscript
index 2fa83c29d..ff374427e 100644
--- a/demo/c++/SConscript
+++ b/demo/c++/SConscript
@@ -35,7 +35,7 @@ headers = env['CPPPATH']
 boost_thread  = 'boost_thread%s' % env['BOOST_APPEND']
 boost_regex  = 'boost_regex%s' % env['BOOST_APPEND']
 
-libraries =  [boost_thread,'mapnik']
+libraries =  [boost_thread,'mapnik2']
 
 if '-DHAVE_CAIRO' in env['CXXFLAGS']:
     # add cairo and cairomm-1.0 to libs
diff --git a/utils/ogrindex/SConscript b/utils/ogrindex/SConscript
index 443bef6f8..4015c5ecc 100644
--- a/utils/ogrindex/SConscript
+++ b/utils/ogrindex/SConscript
@@ -37,7 +37,7 @@ headers = ['#plugins/input/ogr'] + env['CPPPATH']
 boost_program_options = 'boost_program_options%s' % env['BOOST_APPEND']
 boost_iostreams  = 'boost_iostreams%s' % env['BOOST_APPEND']
 boost_filesystem = 'boost_filesystem%s' % env['BOOST_APPEND']
-libraries =  [boost_program_options,boost_iostreams,boost_filesystem,env['PLUGINS']['ogr']['lib'],'mapnik']
+libraries =  [boost_program_options,boost_iostreams,boost_filesystem,env['PLUGINS']['ogr']['lib'],'mapnik2']
 
 boost_system = 'boost_system%s' % env['BOOST_APPEND']
 
diff --git a/utils/upgrade_map_xml/upgrade_map_xml.py b/utils/upgrade_map_xml/upgrade_map_xml.py
index efb06ab36..d3600e65f 100755
--- a/utils/upgrade_map_xml/upgrade_map_xml.py
+++ b/utils/upgrade_map_xml/upgrade_map_xml.py
@@ -17,8 +17,8 @@ def fixup_pointsym(sym):
         sym.attrib.pop('width')
     if sym.attrib.get('height'):
         sym.attrib.pop('height')
-    #if sym.attrib.get('type'):
-    #    sym.attrib.pop('type')
+    if sym.attrib.get('type'):
+        sym.attrib.pop('type')
 
 def fixup_sym_attributes(sym):
     if not hasattr(sym,'CssParameter'):