cleanup

22 files changed, 255 insertions, 758 deletions

diff --git a/cpp/include/Ice/Communicator.h b/cpp/include/Ice/Communicator.h
deleted file mode 100644
index ba593347eb5..00000000000
--- a/cpp/include/Ice/Communicator.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// MutableRealms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-// Generated from file `Communicator.ice'
-
-#ifndef __Communicator_h__
-#define __Communicator_h__
-
-#include <Ice/LocalObject.h>
-#include <Ice/LoggerF.h>
-#include <Ice/ObjectAdapterF.h>
-#include <Ice/PicklerF.h>
-#include <Ice/PropertiesF.h>
-#include <Ice/ValueFactoryF.h>
-
-namespace Ice
-{
-
-class Communicator;
-
-}
-
-namespace __Ice
-{
-
-void ICE_API incRef(::Ice::Communicator*);
-void ICE_API decRef(::Ice::Communicator*);
-
-}
-
-namespace Ice
-{
-
-typedef ::__Ice::Handle< ::Ice::Communicator> Communicator_ptr;
-
-}
-
-namespace Ice
-{
-
-class ICE_API Communicator : public ::Ice::LocalObject
-{
-public: 
-
-    virtual void destroy() = 0;
-
-    virtual void shutdown() = 0;
-
-    virtual void waitForShutdown() = 0;
-
-    virtual ::Ice::Object_prx stringToProxy(const ::std::string&) = 0;
-
-    virtual ::Ice::ObjectAdapter_ptr createObjectAdapter(const ::std::string&) = 0;
-
-    virtual ::Ice::ObjectAdapter_ptr createObjectAdapterWithEndpoints(const ::std::string&, const ::std::string&) = 0;
-
-    virtual void installValueFactory(const ::Ice::ValueFactory_ptr&, const ::std::string&) = 0;
-
-    virtual ::Ice::Properties_ptr getProperties() = 0;
-
-    virtual ::Ice::Logger_ptr getLogger() = 0;
-
-    virtual void setLogger(const ::Ice::Logger_ptr&) = 0;
-
-    virtual ::Ice::Pickler_ptr getPickler() = 0;
-
-    virtual void __write(::__Ice::Stream*);
-    virtual void __read(::__Ice::Stream*);
-};
-
-}
-
-#endif
diff --git a/cpp/include/Ice/CommunicatorF.h b/cpp/include/Ice/CommunicatorF.h
deleted file mode 100644
index 445c51b7fb2..00000000000
--- a/cpp/include/Ice/CommunicatorF.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// MutableRealms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-// Generated from file `CommunicatorF.ice'
-
-#ifndef __CommunicatorF_h__
-#define __CommunicatorF_h__
-
-#include <Ice/LocalObject.h>
-
-namespace Ice
-{
-
-class Communicator;
-
-}
-
-namespace __Ice
-{
-
-void ICE_API incRef(::Ice::Communicator*);
-void ICE_API decRef(::Ice::Communicator*);
-
-}
-
-namespace Ice
-{
-
-typedef ::__Ice::Handle< ::Ice::Communicator> Communicator_ptr;
-
-}
-
-#endif
diff --git a/cpp/include/Ice/Logger.h b/cpp/include/Ice/Logger.h
deleted file mode 100644
index 0056eecd8cc..00000000000
--- a/cpp/include/Ice/Logger.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// MutableRealms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-// Generated from file `Logger.ice'
-
-#ifndef __Logger_h__
-#define __Logger_h__
-
-#include <Ice/LocalObject.h>
-
-namespace Ice
-{
-
-class Logger;
-
-}
-
-namespace __Ice
-{
-
-void ICE_API incRef(::Ice::Logger*);
-void ICE_API decRef(::Ice::Logger*);
-
-}
-
-namespace Ice
-{
-
-typedef ::__Ice::Handle< ::Ice::Logger> Logger_ptr;
-
-}
-
-namespace Ice
-{
-
-class ICE_API Logger : public ::Ice::LocalObject
-{
-public: 
-
-    virtual void trace(const ::std::string&, const ::std::string&) = 0;
-
-    virtual void warning(const ::std::string&) = 0;
-
-    virtual void error(const ::std::string&) = 0;
-
-    virtual void __write(::__Ice::Stream*);
-    virtual void __read(::__Ice::Stream*);
-};
-
-}
-
-#endif
diff --git a/cpp/include/Ice/LoggerF.h b/cpp/include/Ice/LoggerF.h
deleted file mode 100644
index a47794ac22c..00000000000
--- a/cpp/include/Ice/LoggerF.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// MutableRealms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-// Generated from file `LoggerF.ice'
-
-#ifndef __LoggerF_h__
-#define __LoggerF_h__
-
-#include <Ice/LocalObject.h>
-
-namespace Ice
-{
-
-class Logger;
-
-}
-
-namespace __Ice
-{
-
-void ICE_API incRef(::Ice::Logger*);
-void ICE_API decRef(::Ice::Logger*);
-
-}
-
-namespace Ice
-{
-
-typedef ::__Ice::Handle< ::Ice::Logger> Logger_ptr;
-
-}
-
-#endif
diff --git a/cpp/include/Ice/ObjectAdapterF.h b/cpp/include/Ice/ObjectAdapterF.h
deleted file mode 100644
index 00e77505762..00000000000
--- a/cpp/include/Ice/ObjectAdapterF.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// MutableRealms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-// Generated from file `ObjectAdapterF.ice'
-
-#ifndef __ObjectAdapterF_h__
-#define __ObjectAdapterF_h__
-
-#include <Ice/LocalObject.h>
-
-namespace Ice
-{
-
-class ObjectAdapter;
-
-}
-
-namespace __Ice
-{
-
-void ICE_API incRef(::Ice::ObjectAdapter*);
-void ICE_API decRef(::Ice::ObjectAdapter*);
-
-}
-
-namespace Ice
-{
-
-typedef ::__Ice::Handle< ::Ice::ObjectAdapter> ObjectAdapter_ptr;
-
-}
-
-#endif
diff --git a/cpp/include/Ice/PicklerF.h b/cpp/include/Ice/PicklerF.h
deleted file mode 100644
index 66610687b23..00000000000
--- a/cpp/include/Ice/PicklerF.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// MutableRealms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-// Generated from file `PicklerF.ice'
-
-#ifndef __PicklerF_h__
-#define __PicklerF_h__
-
-#include <Ice/LocalObject.h>
-
-namespace Ice
-{
-
-class Pickler;
-
-}
-
-namespace __Ice
-{
-
-void ICE_API incRef(::Ice::Pickler*);
-void ICE_API decRef(::Ice::Pickler*);
-
-}
-
-namespace Ice
-{
-
-typedef ::__Ice::Handle< ::Ice::Pickler> Pickler_ptr;
-
-}
-
-#endif
diff --git a/cpp/include/Ice/PropertiesF.h b/cpp/include/Ice/PropertiesF.h
deleted file mode 100644
index 46165ee0cb9..00000000000
--- a/cpp/include/Ice/PropertiesF.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// MutableRealms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-// Generated from file `PropertiesF.ice'
-
-#ifndef __PropertiesF_h__
-#define __PropertiesF_h__
-
-#include <Ice/LocalObject.h>
-
-namespace Ice
-{
-
-class Properties;
-
-}
-
-namespace __Ice
-{
-
-void ICE_API incRef(::Ice::Properties*);
-void ICE_API decRef(::Ice::Properties*);
-
-}
-
-namespace Ice
-{
-
-typedef ::__Ice::Handle< ::Ice::Properties> Properties_ptr;
-
-}
-
-#endif
diff --git a/cpp/include/Ice/ValueFactoryF.h b/cpp/include/Ice/ValueFactoryF.h
deleted file mode 100644
index 57fdc8322b2..00000000000
--- a/cpp/include/Ice/ValueFactoryF.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// MutableRealms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-// Generated from file `ValueFactoryF.ice'
-
-#ifndef __ValueFactoryF_h__
-#define __ValueFactoryF_h__
-
-#include <Ice/LocalObject.h>
-
-namespace Ice
-{
-
-class ValueFactory;
-
-}
-
-namespace __Ice
-{
-
-void ICE_API incRef(::Ice::ValueFactory*);
-void ICE_API decRef(::Ice::ValueFactory*);
-
-}
-
-namespace Ice
-{
-
-typedef ::__Ice::Handle< ::Ice::ValueFactory> ValueFactory_ptr;
-
-}
-
-#endif
diff --git a/cpp/src/Slice/Grammer.y b/cpp/src/Slice/Grammer.y
index bc08de10d2d..80ee02d3ca0 100644
--- a/cpp/src/Slice/Grammer.y
+++ b/cpp/src/Slice/Grammer.y
@@ -13,7 +13,7 @@
 #include <Parser.h>
 
 using namespace std;
-using namespace IceLang;
+using namespace Slice;
 
 void
 yyerror(const char* s)
diff --git a/cpp/src/Slice/OutputUtil.cpp b/cpp/src/Slice/OutputUtil.cpp
index b55fdac2e70..ff17abd6e0b 100644
--- a/cpp/src/Slice/OutputUtil.cpp
+++ b/cpp/src/Slice/OutputUtil.cpp
@@ -12,9 +12,9 @@
 #include <OutputUtil.h>
 
 using namespace std;
-using namespace IceLang;
+using namespace Slice;
 
-namespace IceLang
+namespace Slice
 {
 
 NextLine nl;
@@ -28,7 +28,7 @@ Separator sp;
 // Output
 // ----------------------------------------------------------------------
 
-IceLang::Output::Output()
+Slice::Output::Output()
     : pos_(0),
       indent_(0),
       indentSave_(-1),
@@ -37,13 +37,13 @@ IceLang::Output::Output()
 }
 
 void
-IceLang::Output::open(const char* s)
+Slice::Output::open(const char* s)
 {
     out_.open(s);
 }
 
 void
-IceLang::Output::print(const char* s)
+Slice::Output::print(const char* s)
 {
     for(unsigned int i = 0; i < strlen(s); ++i)
     {
@@ -57,14 +57,14 @@ IceLang::Output::print(const char* s)
 }
 
 void
-IceLang::Output::inc()
+Slice::Output::inc()
 {
     indent_ += 4;
     separator_ = true;
 }
 
 void
-IceLang::Output::dec()
+Slice::Output::dec()
 {
     assert(indent_ >= 4);
     indent_ -= 4;
@@ -72,7 +72,7 @@ IceLang::Output::dec()
 }
 
 void
-IceLang::Output::useCurrentPosAsIndent()
+Slice::Output::useCurrentPosAsIndent()
 {
     assert(indentSave_ == -1);
     indentSave_ = indent_;
@@ -80,7 +80,7 @@ IceLang::Output::useCurrentPosAsIndent()
 }
 
 void
-IceLang::Output::zeroIndent()
+Slice::Output::zeroIndent()
 {
     assert(indentSave_ == -1);
     indentSave_ = indent_;
@@ -88,7 +88,7 @@ IceLang::Output::zeroIndent()
 }
 
 void
-IceLang::Output::restoreIndent()
+Slice::Output::restoreIndent()
 {
     assert(indentSave_ != -1);
     indent_ = indentSave_;
@@ -96,7 +96,7 @@ IceLang::Output::restoreIndent()
 }
 
 void
-IceLang::Output::nl()
+Slice::Output::nl()
 {
     out_ << '\n';
     pos_ = 0;
@@ -122,7 +122,7 @@ IceLang::Output::nl()
 }
 
 void
-IceLang::Output::sb()
+Slice::Output::sb()
 {
     nl();
     out_ << '{';
@@ -132,7 +132,7 @@ IceLang::Output::sb()
 }
 
 void
-IceLang::Output::eb()
+Slice::Output::eb()
 {
     dec();
     nl();
@@ -141,41 +141,41 @@ IceLang::Output::eb()
 }
 
 void
-IceLang::Output::sp()
+Slice::Output::sp()
 {
     if(separator_)
 	out_ << '\n';
 }
 
 bool
-IceLang::Output::operator!() const
+Slice::Output::operator!() const
 {
     return !out_;
 }
 
 Output&
-IceLang::operator<<(Output& o, const NextLine&)
+Slice::operator<<(Output& o, const NextLine&)
 {
     o.nl();
     return o;
 }
 
 Output&
-IceLang::operator<<(Output& o, const StartBlock&)
+Slice::operator<<(Output& o, const StartBlock&)
 {
     o.sb();
     return o;
 }
 
 Output&
-IceLang::operator<<(Output& o, const EndBlock&)
+Slice::operator<<(Output& o, const EndBlock&)
 {
     o.eb();
     return o;
 }
 
 Output&
-IceLang::operator<<(Output& o, const Separator&)
+Slice::operator<<(Output& o, const Separator&)
 {
     o.sp();
     return o;
diff --git a/cpp/src/Slice/OutputUtil.h b/cpp/src/Slice/OutputUtil.h
index 52250c2ecee..6d8bf1e79de 100644
--- a/cpp/src/Slice/OutputUtil.h
+++ b/cpp/src/Slice/OutputUtil.h
@@ -14,7 +14,7 @@
 #include <fstream>
 #include <sstream>
 
-namespace IceLang
+namespace Slice
 {
 
 class NextLine { };
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index beafbc1725a..540f396f474 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -12,9 +12,9 @@
 #include <Parser.h>
 
 using namespace std;
-using namespace IceLang;
+using namespace Slice;
 
-namespace IceLang
+namespace Slice
 {
 
 Parser* parser;
@@ -63,23 +63,23 @@ void __Ice::decRef(Parser* p) { p -> __decRef(); }
 // ----------------------------------------------------------------------
 
 void
-IceLang::SyntaxTreeBase::destroy()
+Slice::SyntaxTreeBase::destroy()
 {
     parser_ = 0;
 }
 
 Parser_ptr
-IceLang::SyntaxTreeBase::parser()
+Slice::SyntaxTreeBase::parser()
 {
     return parser_;
 }
 
 void
-IceLang::SyntaxTreeBase::visit(ParserVisitor*)
+Slice::SyntaxTreeBase::visit(ParserVisitor*)
 {
 }
 
-IceLang::SyntaxTreeBase::SyntaxTreeBase(const Parser_ptr& parser)
+Slice::SyntaxTreeBase::SyntaxTreeBase(const Parser_ptr& parser)
     : parser_(parser)
 {
 }
@@ -88,7 +88,7 @@ IceLang::SyntaxTreeBase::SyntaxTreeBase(const Parser_ptr& parser)
 // Type
 // ----------------------------------------------------------------------
 
-IceLang::Type::Type(const Parser_ptr& parser)
+Slice::Type::Type(const Parser_ptr& parser)
     : SyntaxTreeBase(parser)
 {
 }
@@ -97,13 +97,13 @@ IceLang::Type::Type(const Parser_ptr& parser)
 // Builtin
 // ----------------------------------------------------------------------
 
-IceLang::Builtin::Kind
-IceLang::Builtin::kind()
+Slice::Builtin::Kind
+Slice::Builtin::kind()
 {
     return kind_;
 }
 
-IceLang::Builtin::Builtin(const Parser_ptr& parser, Kind kind)
+Slice::Builtin::Builtin(const Parser_ptr& parser, Kind kind)
     : Type(parser),
       SyntaxTreeBase(parser),
       kind_(kind)
@@ -115,32 +115,32 @@ IceLang::Builtin::Builtin(const Parser_ptr& parser, Kind kind)
 // ----------------------------------------------------------------------
 
 Container_ptr
-IceLang::Contained::container()
+Slice::Contained::container()
 {
     return container_;
 }
 
 string
-IceLang::Contained::name()
+Slice::Contained::name()
 {
     return name_;
 }
 
 string
-IceLang::Contained::scoped()
+Slice::Contained::scoped()
 {
     return scoped_;
 }
 
 string
-IceLang::Contained::scope()
+Slice::Contained::scope()
 {
     string::size_type idx = scoped_.rfind("::");
     assert(idx != string::npos);
     return string(scoped_, 0, idx);
 }
 
-IceLang::Contained::Contained(const Container_ptr& container,
+Slice::Contained::Contained(const Container_ptr& container,
 			      const string& name)
     : SyntaxTreeBase(container -> parser()),
       container_(container),
@@ -155,13 +155,13 @@ IceLang::Contained::Contained(const Container_ptr& container,
 }
 
 bool
-IceLang::operator<(Contained& l, Contained& r)
+Slice::operator<(Contained& l, Contained& r)
 {
     return l.name() < r.name();
 }
 
 bool
-IceLang::operator==(Contained& l, Contained& r)
+Slice::operator==(Contained& l, Contained& r)
 {
     return l.name() == r.name();
 }
@@ -171,7 +171,7 @@ IceLang::operator==(Contained& l, Contained& r)
 // ----------------------------------------------------------------------
 
 void
-IceLang::Container::destroy()
+Slice::Container::destroy()
 {
     for(vector<Contained_ptr>::iterator p = contents_.begin();
 	p != contents_.end();
@@ -185,7 +185,7 @@ IceLang::Container::destroy()
 }
 
 Module_ptr
-IceLang::Container::createModule(const string& name)
+Slice::Container::createModule(const string& name)
 {
     vector<Contained_ptr> matches =
 	parser_ -> findContents(thisScope() + name);
@@ -206,7 +206,7 @@ IceLang::Container::createModule(const string& name)
 }
 
 ClassDef_ptr
-IceLang::Container::createClassDef(const string& name,
+Slice::Container::createClassDef(const string& name,
 				   const ClassDef_ptr& base,
 				   bool local)
 {
@@ -244,7 +244,7 @@ IceLang::Container::createClassDef(const string& name,
 }
 
 ClassDecl_ptr
-IceLang::Container::createClassDecl(const string& name, bool local)
+Slice::Container::createClassDecl(const string& name, bool local)
 {
     ClassDef_ptr def;
 
@@ -298,7 +298,7 @@ IceLang::Container::createClassDecl(const string& name, bool local)
 }
 
 Vector_ptr
-IceLang::Container::createVector(const string& name, const Type_ptr& type)
+Slice::Container::createVector(const string& name, const Type_ptr& type)
 {
     vector<Contained_ptr> matches =
 	parser_ -> findContents(thisScope() + name);
@@ -310,7 +310,7 @@ IceLang::Container::createVector(const string& name, const Type_ptr& type)
 }
 
 vector<Type_ptr>
-IceLang::Container::lookupType(const string& scoped)
+Slice::Container::lookupType(const string& scoped)
 {
     assert(!scoped.empty());
 
@@ -346,13 +346,13 @@ IceLang::Container::lookupType(const string& scoped)
 }
 
 int
-IceLang::Container::includeLevel()
+Slice::Container::includeLevel()
 {
     return includeLevel_;
 }
 
 bool
-IceLang::Container::hasProxies()
+Slice::Container::hasProxies()
 {
     for(vector<Contained_ptr>::const_iterator p = contents_.begin();
 	p != contents_.end();
@@ -371,7 +371,7 @@ IceLang::Container::hasProxies()
 }
 
 bool
-IceLang::Container::hasClassDecls()
+Slice::Container::hasClassDecls()
 {
     for(vector<Contained_ptr>::const_iterator p = contents_.begin();
 	p != contents_.end();
@@ -389,7 +389,7 @@ IceLang::Container::hasClassDecls()
 }
 
 bool
-IceLang::Container::hasClassDefs()
+Slice::Container::hasClassDefs()
 {
     for(vector<Contained_ptr>::const_iterator p = contents_.begin();
 	p != contents_.end();
@@ -407,7 +407,7 @@ IceLang::Container::hasClassDefs()
 }
 
 bool
-IceLang::Container::hasOtherConstructedTypes()
+Slice::Container::hasOtherConstructedTypes()
 {
     for(vector<Contained_ptr>::const_iterator p = contents_.begin();
 	p != contents_.end();
@@ -427,7 +427,7 @@ IceLang::Container::hasOtherConstructedTypes()
 }
 
 string
-IceLang::Container::thisScope()
+Slice::Container::thisScope()
 {
     string s;
     Contained_ptr contained = Contained_ptr::dynamicCast(this);
@@ -438,7 +438,7 @@ IceLang::Container::thisScope()
 }
 
 void
-IceLang::Container::visit(ParserVisitor* visitor)
+Slice::Container::visit(ParserVisitor* visitor)
 {
     for(vector<Contained_ptr>::const_iterator p = contents_.begin();
 	p != contents_.end();
@@ -448,7 +448,7 @@ IceLang::Container::visit(ParserVisitor* visitor)
     }
 }
 
-IceLang::Container::Container(const Parser_ptr& parser)
+Slice::Container::Container(const Parser_ptr& parser)
     : SyntaxTreeBase(parser)
 {
     if(parser_)
@@ -462,7 +462,7 @@ IceLang::Container::Container(const Parser_ptr& parser)
 // ----------------------------------------------------------------------
 
 void
-IceLang::Module::visit(ParserVisitor* visitor)
+Slice::Module::visit(ParserVisitor* visitor)
 {
     if(includeLevel_ > 0)
 	return;
@@ -472,7 +472,7 @@ IceLang::Module::visit(ParserVisitor* visitor)
     visitor -> visitModuleEnd(this);
 }
 
-IceLang::Module::Module(const Container_ptr& container,
+Slice::Module::Module(const Container_ptr& container,
 			const string& name)
     : Contained(container, name),
       Container(container -> parser()),
@@ -484,7 +484,7 @@ IceLang::Module::Module(const Container_ptr& container,
 // Constructed
 // ----------------------------------------------------------------------
 
-IceLang::Constructed::Constructed(const Container_ptr& container,
+Slice::Constructed::Constructed(const Container_ptr& container,
 				  const string& name)
     : Type(container -> parser()),
       Contained(container, name),
@@ -497,24 +497,24 @@ IceLang::Constructed::Constructed(const Container_ptr& container,
 // ----------------------------------------------------------------------
 
 ClassDef_ptr
-IceLang::ClassDecl::definition()
+Slice::ClassDecl::definition()
 {
     return definition_;
 }
 
 bool
-IceLang::ClassDecl::local()
+Slice::ClassDecl::local()
 {
     return local_;
 }
 
 void
-IceLang::ClassDecl::visit(ParserVisitor* visitor)
+Slice::ClassDecl::visit(ParserVisitor* visitor)
 {
     visitor -> visitClassDecl(this);
 }
 
-IceLang::ClassDecl::ClassDecl(const Container_ptr& container,
+Slice::ClassDecl::ClassDecl(const Container_ptr& container,
 			      const string& name,
 			      bool local)
     : Constructed(container, name),
@@ -530,14 +530,14 @@ IceLang::ClassDecl::ClassDecl(const Container_ptr& container,
 // ----------------------------------------------------------------------
 
 void
-IceLang::ClassDef::destroy()
+Slice::ClassDef::destroy()
 {
     base_ = 0;
     Container::destroy();
 }
 
 Operation_ptr
-IceLang::ClassDef::createOperation(const string& name,
+Slice::ClassDef::createOperation(const string& name,
 				   const Type_ptr& returnType,
 				   const TypeNameList& inParams,
 				   const TypeNameList& outParams,
@@ -554,7 +554,7 @@ IceLang::ClassDef::createOperation(const string& name,
 }
 
 DataMember_ptr
-IceLang::ClassDef::createDataMember(const string& name, const Type_ptr& type)
+Slice::ClassDef::createDataMember(const string& name, const Type_ptr& type)
 {
     vector<Contained_ptr> matches =
 	parser_ -> findContents(thisScope() + name);
@@ -566,19 +566,19 @@ IceLang::ClassDef::createDataMember(const string& name, const Type_ptr& type)
 }
 
 ClassDef_ptr
-IceLang::ClassDef::base()
+Slice::ClassDef::base()
 {
     return base_;
 }
 
 void
-IceLang::ClassDef::base(const ClassDef_ptr& cl)
+Slice::ClassDef::base(const ClassDef_ptr& cl)
 {
     base_ = cl;
 }
 
 vector<Operation_ptr>
-IceLang::ClassDef::operations()
+Slice::ClassDef::operations()
 {
     vector<Operation_ptr> result;
     for(vector<Contained_ptr>::const_iterator p = contents_.begin();
@@ -593,7 +593,7 @@ IceLang::ClassDef::operations()
 }
 
 vector<DataMember_ptr>
-IceLang::ClassDef::dataMembers()
+Slice::ClassDef::dataMembers()
 {
     vector<DataMember_ptr> result;
     for(vector<Contained_ptr>::const_iterator p = contents_.begin();
@@ -608,7 +608,7 @@ IceLang::ClassDef::dataMembers()
 }
 
 bool
-IceLang::ClassDef::abstract()
+Slice::ClassDef::abstract()
 {
     if(base_ && base_ -> abstract())
 	return true;
@@ -625,13 +625,13 @@ IceLang::ClassDef::abstract()
 }
 
 bool
-IceLang::ClassDef::local()
+Slice::ClassDef::local()
 {
     return local_;
 }
 
 void
-IceLang::ClassDef::visit(ParserVisitor* visitor)
+Slice::ClassDef::visit(ParserVisitor* visitor)
 {
     if(includeLevel_ > 0)
 	return;
@@ -641,7 +641,7 @@ IceLang::ClassDef::visit(ParserVisitor* visitor)
     visitor -> visitClassDefEnd(this);
 }
 
-IceLang::ClassDef::ClassDef(const Container_ptr& container,
+Slice::ClassDef::ClassDef(const Container_ptr& container,
 			    const string& name,
 			    const ClassDef_ptr& base,
 			    bool local)
@@ -658,12 +658,12 @@ IceLang::ClassDef::ClassDef(const Container_ptr& container,
 // ----------------------------------------------------------------------
 
 ClassDecl_ptr
-IceLang::Proxy::_class()
+Slice::Proxy::_class()
 {
     return class_;
 }
 
-IceLang::Proxy::Proxy(const ClassDecl_ptr& cl)
+Slice::Proxy::Proxy(const ClassDecl_ptr& cl)
     : Type(cl -> parser()),
       SyntaxTreeBase(cl -> parser()),
       class_(cl)
@@ -675,36 +675,36 @@ IceLang::Proxy::Proxy(const ClassDecl_ptr& cl)
 // ----------------------------------------------------------------------
 
 Type_ptr
-IceLang::Operation::returnType()
+Slice::Operation::returnType()
 {
     return returnType_;
 }
 
 TypeNameList
-IceLang::Operation::inputParameters()
+Slice::Operation::inputParameters()
 {
     return inParams_;
 }
 
 TypeNameList
-IceLang::Operation::outputParameters()
+Slice::Operation::outputParameters()
 {
     return outParams_;
 }
 
 TypeList
-IceLang::Operation::throws()
+Slice::Operation::throws()
 {
     return throws_;
 }
 
 void
-IceLang::Operation::visit(ParserVisitor* visitor)
+Slice::Operation::visit(ParserVisitor* visitor)
 {
     visitor -> visitOperation(this);
 }
 
-IceLang::Operation::Operation(const Container_ptr& container,
+Slice::Operation::Operation(const Container_ptr& container,
 			      const string& name,
 			      const Type_ptr& returnType,
 			      const TypeNameList& inParams,
@@ -724,17 +724,17 @@ IceLang::Operation::Operation(const Container_ptr& container,
 // ----------------------------------------------------------------------
 
 Type_ptr
-IceLang::DataMember::type()
+Slice::DataMember::type()
 {
     return type_;
 }
 void
-IceLang::DataMember::visit(ParserVisitor* visitor)
+Slice::DataMember::visit(ParserVisitor* visitor)
 {
     visitor -> visitDataMember(this);
 }
 
-IceLang::DataMember::DataMember(const Container_ptr& container,
+Slice::DataMember::DataMember(const Container_ptr& container,
 				const string& name,
 				const Type_ptr& type)
     : Contained(container, name),
@@ -748,18 +748,18 @@ IceLang::DataMember::DataMember(const Container_ptr& container,
 // ----------------------------------------------------------------------
 
 Type_ptr
-IceLang::Vector::type()
+Slice::Vector::type()
 {
     return type_;
 }
 
 void
-IceLang::Vector::visit(ParserVisitor* visitor)
+Slice::Vector::visit(ParserVisitor* visitor)
 {
     visitor -> visitVector(this);
 }
 
-IceLang::Vector::Vector(const Container_ptr& container,
+Slice::Vector::Vector(const Container_ptr& container,
 			const string& name,
 			const Type_ptr& type)
     : Constructed(container, name),
@@ -775,19 +775,19 @@ IceLang::Vector::Vector(const Container_ptr& container,
 // ----------------------------------------------------------------------
 
 Parser_ptr
-IceLang::Parser::createParser()
+Slice::Parser::createParser()
 {
     return new Parser;
 }
 
 void
-IceLang::Parser::nextLine()
+Slice::Parser::nextLine()
 {
     currentLine_++;
 }
 
 void
-IceLang::Parser::scanPosition(const char* s)
+Slice::Parser::scanPosition(const char* s)
 {
     string line(s);
     string::size_type idx;
@@ -850,52 +850,52 @@ IceLang::Parser::scanPosition(const char* s)
 }
 
 int
-IceLang::Parser::currentIncludeLevel()
+Slice::Parser::currentIncludeLevel()
 {
     return currentIncludeLevel_;
 }
 
 void
-IceLang::Parser::error(const char* s)
+Slice::Parser::error(const char* s)
 {
     cerr << currentFile_ << ':' << currentLine_ << " error: " << s << endl;
     yynerrs++;
 }
 
 void
-IceLang::Parser::warning(const char* s)
+Slice::Parser::warning(const char* s)
 {
     cerr << currentFile_ << ':' << currentLine_ << " warning: " << s << endl;
 }
 
 Container_ptr
-IceLang::Parser::currentContainer()
+Slice::Parser::currentContainer()
 {
     assert(!containerStack_.empty());
     return containerStack_.top();
 }
 
 void
-IceLang::Parser::pushContainer(const Container_ptr& cont)
+Slice::Parser::pushContainer(const Container_ptr& cont)
 {
     containerStack_.push(cont);    
 }
 
 void
-IceLang::Parser::popContainer()
+Slice::Parser::popContainer()
 {
     assert(!containerStack_.empty());
     containerStack_.pop();
 }
 
 void
-IceLang::Parser::addContent(const Contained_ptr& contained)
+Slice::Parser::addContent(const Contained_ptr& contained)
 {
     contentMap_[contained -> scoped()].push_back(contained);
 }
 
 vector<Contained_ptr>
-IceLang::Parser::findContents(const string& scoped)
+Slice::Parser::findContents(const string& scoped)
 {
     assert(!scoped.empty());
     assert(scoped[0] == ':');
@@ -910,16 +910,16 @@ IceLang::Parser::findContents(const string& scoped)
 }
 
 vector<string>
-IceLang::Parser::includeFiles()
+Slice::Parser::includeFiles()
 {
     return includeFiles_;
 }
 
 int
-IceLang::Parser::parse(FILE* file)
+Slice::Parser::parse(FILE* file)
 {
-    assert(!IceLang::parser);
-    IceLang::parser = this;
+    assert(!Slice::parser);
+    Slice::parser = this;
 
     currentLine_ = 1;
     currentIncludeLevel_ = 0;
@@ -935,19 +935,19 @@ IceLang::Parser::parse(FILE* file)
     assert(containerStack_.size() == 1);
     popContainer();
 
-    IceLang::parser = 0;
+    Slice::parser = 0;
     return status;
 }
 
 void
-IceLang::Parser::destroy()
+Slice::Parser::destroy()
 {
     builtins_.clear();
     Container::destroy();
 }
 
 void
-IceLang::Parser::visit(ParserVisitor* visitor)
+Slice::Parser::visit(ParserVisitor* visitor)
 {
     visitor -> visitUnitStart(this);
     Container::visit(visitor);
@@ -955,7 +955,7 @@ IceLang::Parser::visit(ParserVisitor* visitor)
 }
 
 Builtin_ptr
-IceLang::Parser::builtin(Builtin::Kind kind)
+Slice::Parser::builtin(Builtin::Kind kind)
 {
     map<Builtin::Kind, Builtin_ptr>::iterator p = builtins_.find(kind);
     if(p != builtins_.end())
@@ -965,7 +965,7 @@ IceLang::Parser::builtin(Builtin::Kind kind)
     return builtin;
 }
 
-IceLang::Parser::Parser()
+Slice::Parser::Parser()
     : SyntaxTreeBase(0),
       Container(0)
 {
diff --git a/cpp/src/Slice/Parser.h b/cpp/src/Slice/Parser.h
index 0c30a3b097b..c6a66a95f19 100644
--- a/cpp/src/Slice/Parser.h
+++ b/cpp/src/Slice/Parser.h
@@ -27,7 +27,7 @@ void yyerror(const char* s);
 // Type_ptr declarations, reference counting, and handle types
 // ----------------------------------------------------------------------
 
-namespace IceLang
+namespace Slice
 {
 
 class Token;
@@ -54,46 +54,46 @@ class Parser;
 namespace __Ice
 {
 
-void incRef(::IceLang::Token*);
-void decRef(::IceLang::Token*);
-void incRef(::IceLang::String*);
-void decRef(::IceLang::String*);
-void incRef(::IceLang::Parameters*);
-void decRef(::IceLang::Parameters*);
-void incRef(::IceLang::Throws*);
-void decRef(::IceLang::Throws*);
-void incRef(::IceLang::SyntaxTreeBase*);
-void decRef(::IceLang::SyntaxTreeBase*);
-void incRef(::IceLang::Type*);
-void decRef(::IceLang::Type*);
-void incRef(::IceLang::Builtin*);
-void decRef(::IceLang::Builtin*);
-void incRef(::IceLang::Contained*);
-void decRef(::IceLang::Contained*);
-void incRef(::IceLang::Container*);
-void decRef(::IceLang::Container*);
-void incRef(::IceLang::Module*);
-void decRef(::IceLang::Module*);
-void incRef(::IceLang::Constructed*);
-void decRef(::IceLang::Constructed*);
-void incRef(::IceLang::ClassDecl*);
-void decRef(::IceLang::ClassDecl*);
-void incRef(::IceLang::ClassDef*);
-void decRef(::IceLang::ClassDef*);
-void incRef(::IceLang::Proxy*);
-void decRef(::IceLang::Proxy*);
-void incRef(::IceLang::Operation*);
-void decRef(::IceLang::Operation*);
-void incRef(::IceLang::DataMember*);
-void decRef(::IceLang::DataMember*);
-void incRef(::IceLang::Vector*);
-void decRef(::IceLang::Vector*);
-void incRef(::IceLang::Parser*);
-void decRef(::IceLang::Parser*);
+void incRef(::Slice::Token*);
+void decRef(::Slice::Token*);
+void incRef(::Slice::String*);
+void decRef(::Slice::String*);
+void incRef(::Slice::Parameters*);
+void decRef(::Slice::Parameters*);
+void incRef(::Slice::Throws*);
+void decRef(::Slice::Throws*);
+void incRef(::Slice::SyntaxTreeBase*);
+void decRef(::Slice::SyntaxTreeBase*);
+void incRef(::Slice::Type*);
+void decRef(::Slice::Type*);
+void incRef(::Slice::Builtin*);
+void decRef(::Slice::Builtin*);
+void incRef(::Slice::Contained*);
+void decRef(::Slice::Contained*);
+void incRef(::Slice::Container*);
+void decRef(::Slice::Container*);
+void incRef(::Slice::Module*);
+void decRef(::Slice::Module*);
+void incRef(::Slice::Constructed*);
+void decRef(::Slice::Constructed*);
+void incRef(::Slice::ClassDecl*);
+void decRef(::Slice::ClassDecl*);
+void incRef(::Slice::ClassDef*);
+void decRef(::Slice::ClassDef*);
+void incRef(::Slice::Proxy*);
+void decRef(::Slice::Proxy*);
+void incRef(::Slice::Operation*);
+void decRef(::Slice::Operation*);
+void incRef(::Slice::DataMember*);
+void decRef(::Slice::DataMember*);
+void incRef(::Slice::Vector*);
+void decRef(::Slice::Vector*);
+void incRef(::Slice::Parser*);
+void decRef(::Slice::Parser*);
 
 }
 
-namespace IceLang
+namespace Slice
 {
 
 typedef ::__Ice::Handle<Token> Token_ptr;
@@ -117,7 +117,7 @@ typedef ::__Ice::Handle<Parser> Parser_ptr;
 
 }
 
-namespace IceLang
+namespace Slice
 {
 
 typedef std::list<Type_ptr> TypeList;
@@ -153,7 +153,7 @@ class Token : virtual public ::__Ice::SimpleShared
 {
 };
 
-#define YYSTYPE IceLang::Token_ptr
+#define YYSTYPE Slice::Token_ptr
 
 // ----------------------------------------------------------------------
 // String
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l
index 111290afb1d..cfd44d121c7 100644
--- a/cpp/src/Slice/Scanner.l
+++ b/cpp/src/Slice/Scanner.l
@@ -14,7 +14,7 @@
 #include <Grammer.h>
 
 using namespace std;
-using namespace IceLang;
+using namespace Slice;
 
 %}
 
diff --git a/cpp/src/slice2cpp/.depend b/cpp/src/slice2cpp/.depend
index b56343352aa..de3053fcdab 100644
--- a/cpp/src/slice2cpp/.depend
+++ b/cpp/src/slice2cpp/.depend
@@ -1,3 +1,3 @@
-GenCPlusPlus.o: GenCPlusPlus.cpp ../../../include/Ice/Functional.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h GenCPlusPlus.h ../parser/Parser.h ../../../include/Ice/Shared.h ../parser/OutputUtil.h GenCPlusPlusUtil.h
-GenCPlusPlusUtil.o: GenCPlusPlusUtil.cpp GenCPlusPlusUtil.h ../parser/Parser.h ../../../include/Ice/Shared.h ../../../include/Ice/Config.h ../../../include/Ice/Handle.h ../parser/OutputUtil.h
-Main.o: Main.cpp GenCPlusPlus.h ../parser/Parser.h ../../../include/Ice/Shared.h ../../../include/Ice/Config.h ../../../include/Ice/Handle.h ../parser/OutputUtil.h
+Gen.o: Gen.cpp ../../../include/Ice/Functional.h ../../../include/Ice/Handle.h ../../../include/Ice/Config.h Gen.h ../parser/Parser.h ../../../include/Ice/Shared.h ../parser/OutputUtil.h GenUtil.h
+GenUtil.o: GenUtil.cpp GenUtil.h ../parser/Parser.h ../../../include/Ice/Shared.h ../../../include/Ice/Config.h ../../../include/Ice/Handle.h ../parser/OutputUtil.h
+Main.o: Main.cpp Gen.h ../parser/Parser.h ../../../include/Ice/Shared.h ../../../include/Ice/Config.h ../../../include/Ice/Handle.h ../parser/OutputUtil.h
diff --git a/cpp/src/slice2cpp/GenCPlusPlus.cpp b/cpp/src/slice2cpp/Gen.cpp
index 21559bee07d..ef82ed084a5 100644
--- a/cpp/src/slice2cpp/GenCPlusPlus.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -9,11 +9,11 @@
 // **********************************************************************
 
 #include <Ice/Functional.h>
-#include <GenCPlusPlus.h>
-#include <GenCPlusPlusUtil.h>
+#include <Gen.h>
+#include <GenUtil.h>
 
 using namespace std;
-using namespace IceLang;
+using namespace Slice;
 
 struct ToIfdef
 {
@@ -26,15 +26,11 @@ struct ToIfdef
     }
 };
 
-// ----------------------------------------------------------------------
-// GenCPlusPlus
-// ----------------------------------------------------------------------
-
-IceLang::GenCPlusPlus::GenCPlusPlus(const string& name,
-				    const string& base,
-				    const string& include,
-				    const vector<string>& includePaths,
-				    const string& dllExport)
+Slice::Gen::Gen(const string& name,
+		const string& base,
+		const string& include,
+		const vector<string>& includePaths,
+		const string& dllExport)
     : base_(base),
       include_(include),
       includePaths_(includePaths),
@@ -83,20 +79,20 @@ IceLang::GenCPlusPlus::GenCPlusPlus(const string& name,
     H << '\n';
 }
 
-IceLang::GenCPlusPlus::~GenCPlusPlus()
+Slice::Gen::~Gen()
 {
     H << "\n\n#endif\n";
     C << '\n';
 }
 
 bool
-IceLang::GenCPlusPlus::operator!() const
+Slice::Gen::operator!() const
 {
     return !H || !C;
 }
 
 void
-IceLang::GenCPlusPlus::generate(const Parser_ptr& parser)
+Slice::Gen::generate(const Parser_ptr& parser)
 {
     C << "\n#include <";
     if(include_.length())
@@ -157,7 +153,7 @@ IceLang::GenCPlusPlus::generate(const Parser_ptr& parser)
 }
 
 string
-IceLang::GenCPlusPlus::changeInclude(const string& orig)
+Slice::Gen::changeInclude(const string& orig)
 {
     string file = orig;
     for(vector<string>::iterator p = includePaths_.begin();
@@ -180,7 +176,7 @@ IceLang::GenCPlusPlus::changeInclude(const string& orig)
 }
 
 void
-IceLang::GenCPlusPlus::printHeader(Output& out)
+Slice::Gen::printHeader(Output& out)
 {
     static const char* header = 
 "// **********************************************************************\n"
@@ -199,19 +195,14 @@ IceLang::GenCPlusPlus::printHeader(Output& out)
     out << '\n';
 }
 
-// ----------------------------------------------------------------------
-// TypesVisitor
-// ----------------------------------------------------------------------
-
-IceLang::GenCPlusPlus::TypesVisitor::TypesVisitor(
-    Output& h, Output& c, const string& dllExport)
+Slice::Gen::TypesVisitor::TypesVisitor(Output& h, Output& c,
+				       const string& dllExport)
     : H(h), C(c), dllExport_(dllExport)
 {
 }
 
 void
-IceLang::GenCPlusPlus::TypesVisitor::visitModuleStart(
-    const Module_ptr& p)
+Slice::Gen::TypesVisitor::visitModuleStart(const Module_ptr& p)
 {
     if(!p -> hasOtherConstructedTypes())
 	return;
@@ -223,8 +214,7 @@ IceLang::GenCPlusPlus::TypesVisitor::visitModuleStart(
 }
 
 void
-IceLang::GenCPlusPlus::TypesVisitor::visitModuleEnd(
-    const Module_ptr& p)
+Slice::Gen::TypesVisitor::visitModuleEnd(const Module_ptr& p)
 {
     if(!p -> hasOtherConstructedTypes())
 	return;
@@ -234,8 +224,7 @@ IceLang::GenCPlusPlus::TypesVisitor::visitModuleEnd(
 }
 
 void
-IceLang::GenCPlusPlus::TypesVisitor::visitVector(
-    const Vector_ptr& p)
+Slice::Gen::TypesVisitor::visitVector(const Vector_ptr& p)
 {
     string name = p -> name();
     Type_ptr subtype = p -> type();
@@ -296,19 +285,14 @@ IceLang::GenCPlusPlus::TypesVisitor::visitVector(
     }
 }
 
-// ----------------------------------------------------------------------
-// ProxyDeclVisitor
-// ----------------------------------------------------------------------
-
-IceLang::GenCPlusPlus::ProxyDeclVisitor::ProxyDeclVisitor(
-    Output& h, Output& c, const string& dllExport)
+Slice::Gen::ProxyDeclVisitor::ProxyDeclVisitor(Output& h, Output& c,
+					       const string& dllExport)
     : H(h), C(c), dllExport_(dllExport)
 {
 }
 
 void
-IceLang::GenCPlusPlus::ProxyDeclVisitor::visitUnitStart(
-    const Parser_ptr& p)
+Slice::Gen::ProxyDeclVisitor::visitUnitStart(const Parser_ptr& p)
 {
     if(!p -> hasProxies())
 	return;
@@ -318,8 +302,7 @@ IceLang::GenCPlusPlus::ProxyDeclVisitor::visitUnitStart(
 }
 
 void
-IceLang::GenCPlusPlus::ProxyDeclVisitor::visitUnitEnd(
-    const Parser_ptr& p)
+Slice::Gen::ProxyDeclVisitor::visitUnitEnd(const Parser_ptr& p)
 {
     if(!p -> hasProxies())
 	return;
@@ -329,8 +312,7 @@ IceLang::GenCPlusPlus::ProxyDeclVisitor::visitUnitEnd(
 }
     
 void
-IceLang::GenCPlusPlus::ProxyDeclVisitor::visitModuleStart(
-    const Module_ptr& p)
+Slice::Gen::ProxyDeclVisitor::visitModuleStart(const Module_ptr& p)
 {
     if(!p -> hasProxies())
 	return;
@@ -342,8 +324,7 @@ IceLang::GenCPlusPlus::ProxyDeclVisitor::visitModuleStart(
 }
 
 void
-IceLang::GenCPlusPlus::ProxyDeclVisitor::visitModuleEnd(
-    const Module_ptr& p)
+Slice::Gen::ProxyDeclVisitor::visitModuleEnd(const Module_ptr& p)
 {
     if(!p -> hasProxies())
 	return;
@@ -353,8 +334,7 @@ IceLang::GenCPlusPlus::ProxyDeclVisitor::visitModuleEnd(
 }
 
 void
-IceLang::GenCPlusPlus::ProxyDeclVisitor::visitClassDecl(
-    const ClassDecl_ptr& p)
+Slice::Gen::ProxyDeclVisitor::visitClassDecl(const ClassDecl_ptr& p)
 {
     if(p -> local())
 	return;
@@ -365,19 +345,14 @@ IceLang::GenCPlusPlus::ProxyDeclVisitor::visitClassDecl(
     H << nl << "class " << name << ';';
 }
 
-// ----------------------------------------------------------------------
-// ProxyVisitor
-// ----------------------------------------------------------------------
-
-IceLang::GenCPlusPlus::ProxyVisitor::ProxyVisitor(
-    Output& h, Output& c, const string& dllExport)
+Slice::Gen::ProxyVisitor::ProxyVisitor(Output& h, Output& c,
+				       const string& dllExport)
     : H(h), C(c), dllExport_(dllExport)
 {
 }
 
 void
-IceLang::GenCPlusPlus::ProxyVisitor::visitUnitStart(
-    const Parser_ptr& p)
+Slice::Gen::ProxyVisitor::visitUnitStart(const Parser_ptr& p)
 {
     if(!p -> hasProxies())
 	return;
@@ -387,8 +362,7 @@ IceLang::GenCPlusPlus::ProxyVisitor::visitUnitStart(
 }
 
 void
-IceLang::GenCPlusPlus::ProxyVisitor::visitUnitEnd(
-    const Parser_ptr& p)
+Slice::Gen::ProxyVisitor::visitUnitEnd(const Parser_ptr& p)
 {
     if(!p -> hasProxies())
 	return;
@@ -398,8 +372,7 @@ IceLang::GenCPlusPlus::ProxyVisitor::visitUnitEnd(
 }
     
 void
-IceLang::GenCPlusPlus::ProxyVisitor::visitModuleStart(
-    const Module_ptr& p)
+Slice::Gen::ProxyVisitor::visitModuleStart(const Module_ptr& p)
 {
     if(!p -> hasProxies())
 	return;
@@ -411,8 +384,7 @@ IceLang::GenCPlusPlus::ProxyVisitor::visitModuleStart(
 }
 
 void
-IceLang::GenCPlusPlus::ProxyVisitor::visitModuleEnd(
-    const Module_ptr& p)
+Slice::Gen::ProxyVisitor::visitModuleEnd(const Module_ptr& p)
 {
     if(!p -> hasProxies())
 	return;
@@ -422,8 +394,7 @@ IceLang::GenCPlusPlus::ProxyVisitor::visitModuleEnd(
 }
 
 void
-IceLang::GenCPlusPlus::ProxyVisitor::visitClassDefStart(
-    const ClassDef_ptr& p)
+Slice::Gen::ProxyVisitor::visitClassDefStart(const ClassDef_ptr& p)
 {
     if(p -> local())
 	return;
@@ -447,8 +418,7 @@ IceLang::GenCPlusPlus::ProxyVisitor::visitClassDefStart(
 }
 
 void
-IceLang::GenCPlusPlus::ProxyVisitor::visitClassDefEnd(
-    const ClassDef_ptr& p)
+Slice::Gen::ProxyVisitor::visitClassDefEnd(const ClassDef_ptr& p)
 {
     if(p -> local())
 	return;
@@ -472,8 +442,7 @@ IceLang::GenCPlusPlus::ProxyVisitor::visitClassDefEnd(
 }
 
 void
-IceLang::GenCPlusPlus::ProxyVisitor::visitOperation(
-    const Operation_ptr& p)
+Slice::Gen::ProxyVisitor::visitOperation(const Operation_ptr& p)
 {
     Container_ptr container = p -> container();
     ClassDef_ptr cl = ClassDef_ptr::dynamicCast(container);
@@ -552,19 +521,14 @@ IceLang::GenCPlusPlus::ProxyVisitor::visitOperation(
     C << eb;
 }
 
-// ----------------------------------------------------------------------
-// DelegateVisitor
-// ----------------------------------------------------------------------
-
-IceLang::GenCPlusPlus::DelegateVisitor::DelegateVisitor(
-    Output& h, Output& c, const string& dllExport)
+Slice::Gen::DelegateVisitor::DelegateVisitor(Output& h, Output& c,
+					     const string& dllExport)
     : H(h), C(c), dllExport_(dllExport)
 {
 }
 
 void
-IceLang::GenCPlusPlus::DelegateVisitor::visitUnitStart(
-    const Parser_ptr& p)
+Slice::Gen::DelegateVisitor::visitUnitStart(const Parser_ptr& p)
 {
     if(!p -> hasProxies())
 	return;
@@ -574,8 +538,7 @@ IceLang::GenCPlusPlus::DelegateVisitor::visitUnitStart(
 }
 
 void
-IceLang::GenCPlusPlus::DelegateVisitor::visitUnitEnd(
-    const Parser_ptr& p)
+Slice::Gen::DelegateVisitor::visitUnitEnd(const Parser_ptr& p)
 {
     if(!p -> hasProxies())
 	return;
@@ -585,8 +548,7 @@ IceLang::GenCPlusPlus::DelegateVisitor::visitUnitEnd(
 }
     
 void
-IceLang::GenCPlusPlus::DelegateVisitor::visitModuleStart(
-    const Module_ptr& p)
+Slice::Gen::DelegateVisitor::visitModuleStart(const Module_ptr& p)
 {
     if(!p -> hasProxies())
 	return;
@@ -598,8 +560,7 @@ IceLang::GenCPlusPlus::DelegateVisitor::visitModuleStart(
 }
 
 void
-IceLang::GenCPlusPlus::DelegateVisitor::visitModuleEnd(
-    const Module_ptr& p)
+Slice::Gen::DelegateVisitor::visitModuleEnd(const Module_ptr& p)
 {
     if(!p -> hasProxies())
 	return;
@@ -609,8 +570,7 @@ IceLang::GenCPlusPlus::DelegateVisitor::visitModuleEnd(
 }
 
 void
-IceLang::GenCPlusPlus::DelegateVisitor::visitClassDefStart(
-    const ClassDef_ptr& p)
+Slice::Gen::DelegateVisitor::visitClassDefStart(const ClassDef_ptr& p)
 {
     if(p -> local())
 	return;
@@ -633,8 +593,7 @@ IceLang::GenCPlusPlus::DelegateVisitor::visitClassDefStart(
 }
 
 void
-IceLang::GenCPlusPlus::DelegateVisitor::visitClassDefEnd(
-    const ClassDef_ptr& p)
+Slice::Gen::DelegateVisitor::visitClassDefEnd(const ClassDef_ptr& p)
 {
     if(p -> local())
 	return;
@@ -643,8 +602,7 @@ IceLang::GenCPlusPlus::DelegateVisitor::visitClassDefEnd(
 }
 
 void
-IceLang::GenCPlusPlus::DelegateVisitor::visitOperation(
-    const Operation_ptr& p)
+Slice::Gen::DelegateVisitor::visitOperation(const Operation_ptr& p)
 {
     Container_ptr container = p -> container();
     ClassDef_ptr cl = ClassDef_ptr::dynamicCast(container);
@@ -698,19 +656,14 @@ IceLang::GenCPlusPlus::DelegateVisitor::visitOperation(
     H << nl << "virtual " << retS << ' ' << name << params << " = 0;";
 }
 
-// ----------------------------------------------------------------------
-// DelegateMVisitor
-// ----------------------------------------------------------------------
-
-IceLang::GenCPlusPlus::DelegateMVisitor::DelegateMVisitor(
-    Output& h, Output& c, const string& dllExport)
+Slice::Gen::DelegateMVisitor::DelegateMVisitor(Output& h, Output& c,
+					       const string& dllExport)
     : H(h), C(c), dllExport_(dllExport)
 {
 }
 
 void
-IceLang::GenCPlusPlus::DelegateMVisitor::visitUnitStart(
-    const Parser_ptr& p)
+Slice::Gen::DelegateMVisitor::visitUnitStart(const Parser_ptr& p)
 {
     if(!p -> hasProxies())
 	return;
@@ -720,8 +673,7 @@ IceLang::GenCPlusPlus::DelegateMVisitor::visitUnitStart(
 }
 
 void
-IceLang::GenCPlusPlus::DelegateMVisitor::visitUnitEnd(
-    const Parser_ptr& p)
+Slice::Gen::DelegateMVisitor::visitUnitEnd(const Parser_ptr& p)
 {
     if(!p -> hasProxies())
 	return;
@@ -731,8 +683,7 @@ IceLang::GenCPlusPlus::DelegateMVisitor::visitUnitEnd(
 }
     
 void
-IceLang::GenCPlusPlus::DelegateMVisitor::visitModuleStart(
-    const Module_ptr& p)
+Slice::Gen::DelegateMVisitor::visitModuleStart(const Module_ptr& p)
 {
     if(!p -> hasProxies())
 	return;
@@ -744,8 +695,7 @@ IceLang::GenCPlusPlus::DelegateMVisitor::visitModuleStart(
 }
 
 void
-IceLang::GenCPlusPlus::DelegateMVisitor::visitModuleEnd(
-    const Module_ptr& p)
+Slice::Gen::DelegateMVisitor::visitModuleEnd(const Module_ptr& p)
 {
     if(!p -> hasProxies())
 	return;
@@ -755,8 +705,7 @@ IceLang::GenCPlusPlus::DelegateMVisitor::visitModuleEnd(
 }
 
 void
-IceLang::GenCPlusPlus::DelegateMVisitor::visitClassDefStart(
-    const ClassDef_ptr& p)
+Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDef_ptr& p)
 {
     if(p -> local())
 	return;
@@ -784,8 +733,7 @@ IceLang::GenCPlusPlus::DelegateMVisitor::visitClassDefStart(
 }
 
 void
-IceLang::GenCPlusPlus::DelegateMVisitor::visitClassDefEnd(
-    const ClassDef_ptr& p)
+Slice::Gen::DelegateMVisitor::visitClassDefEnd(const ClassDef_ptr& p)
 {
     if(p -> local())
 	return;
@@ -794,8 +742,7 @@ IceLang::GenCPlusPlus::DelegateMVisitor::visitClassDefEnd(
 }
 
 void
-IceLang::GenCPlusPlus::DelegateMVisitor::visitOperation(
-    const Operation_ptr& p)
+Slice::Gen::DelegateMVisitor::visitOperation(const Operation_ptr& p)
 {
     Container_ptr container = p -> container();
     ClassDef_ptr cl = ClassDef_ptr::dynamicCast(container);
@@ -910,19 +857,14 @@ IceLang::GenCPlusPlus::DelegateMVisitor::visitOperation(
     C << eb;
 }
 
-// ----------------------------------------------------------------------
-// ObjectDeclVisitor
-// ----------------------------------------------------------------------
-
-IceLang::GenCPlusPlus::ObjectDeclVisitor::ObjectDeclVisitor(
-    Output& h, Output& c, const string& dllExport)
+Slice::Gen::ObjectDeclVisitor::ObjectDeclVisitor(Output& h, Output& c,
+						 const string& dllExport)
     : H(h), C(c), dllExport_(dllExport)
 {
 }
 
 void
-IceLang::GenCPlusPlus::ObjectDeclVisitor::visitModuleStart(
-    const Module_ptr& p)
+Slice::Gen::ObjectDeclVisitor::visitModuleStart(const Module_ptr& p)
 {
     if(!p -> hasClassDecls())
 	return;
@@ -934,8 +876,7 @@ IceLang::GenCPlusPlus::ObjectDeclVisitor::visitModuleStart(
 }
 
 void
-IceLang::GenCPlusPlus::ObjectDeclVisitor::visitModuleEnd(
-    const Module_ptr& p)
+Slice::Gen::ObjectDeclVisitor::visitModuleEnd(const Module_ptr& p)
 {
     if(!p -> hasClassDecls())
 	return;
@@ -945,8 +886,7 @@ IceLang::GenCPlusPlus::ObjectDeclVisitor::visitModuleEnd(
 }
 
 void
-IceLang::GenCPlusPlus::ObjectDeclVisitor::visitClassDecl(
-    const ClassDecl_ptr& p)
+Slice::Gen::ObjectDeclVisitor::visitClassDecl(const ClassDecl_ptr& p)
 {
     string name = p -> name();
     
@@ -954,19 +894,14 @@ IceLang::GenCPlusPlus::ObjectDeclVisitor::visitClassDecl(
     H << nl << "class " << name << ';';
 }
 
-// ----------------------------------------------------------------------
-// ObjectVisitor
-// ----------------------------------------------------------------------
-
-IceLang::GenCPlusPlus::ObjectVisitor::ObjectVisitor(
-    Output& h, Output& c, const string& dllExport)
+Slice::Gen::ObjectVisitor::ObjectVisitor(Output& h, Output& c,
+					 const string& dllExport)
     : H(h), C(c), dllExport_(dllExport)
 {
 }
 
 void
-IceLang::GenCPlusPlus::ObjectVisitor::visitModuleStart(
-    const Module_ptr& p)
+Slice::Gen::ObjectVisitor::visitModuleStart(const Module_ptr& p)
 {
     if(!p -> hasClassDefs())
 	return;
@@ -978,8 +913,7 @@ IceLang::GenCPlusPlus::ObjectVisitor::visitModuleStart(
 }
 
 void
-IceLang::GenCPlusPlus::ObjectVisitor::visitModuleEnd(
-    const Module_ptr& p)
+Slice::Gen::ObjectVisitor::visitModuleEnd(const Module_ptr& p)
 {
     if(!p -> hasClassDefs())
 	return;
@@ -989,8 +923,7 @@ IceLang::GenCPlusPlus::ObjectVisitor::visitModuleEnd(
 }
 
 void
-IceLang::GenCPlusPlus::ObjectVisitor::visitClassDefStart(
-    const ClassDef_ptr& p)
+Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDef_ptr& p)
 {
     bool local = p -> local();
     string name = p -> name();
@@ -1073,8 +1006,7 @@ IceLang::GenCPlusPlus::ObjectVisitor::visitClassDefStart(
 }
     
 void
-IceLang::GenCPlusPlus::ObjectVisitor::visitClassDefEnd(
-    const ClassDef_ptr& p)
+Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDef_ptr& p)
 {
     string name = p -> name();
     string scoped = p -> scoped();
@@ -1211,8 +1143,7 @@ IceLang::GenCPlusPlus::ObjectVisitor::visitClassDefEnd(
 }
 
 void
-IceLang::GenCPlusPlus::ObjectVisitor::visitOperation(
-    const Operation_ptr& p)
+Slice::Gen::ObjectVisitor::visitOperation(const Operation_ptr& p)
 {
     Container_ptr container = p -> container();
     ClassDef_ptr cl = ClassDef_ptr::dynamicCast(container);
@@ -1320,8 +1251,7 @@ IceLang::GenCPlusPlus::ObjectVisitor::visitOperation(
 }
 
 void
-IceLang::GenCPlusPlus::ObjectVisitor::visitDataMember(
-    const DataMember_ptr& p)
+Slice::Gen::ObjectVisitor::visitDataMember(const DataMember_ptr& p)
 {
     string name = p -> name();
     string s = typeToString(p -> type());
@@ -1329,19 +1259,14 @@ IceLang::GenCPlusPlus::ObjectVisitor::visitDataMember(
     H << nl << s << ' ' << name << ';';
 }
 
-// ----------------------------------------------------------------------
-// IceVisitor
-// ----------------------------------------------------------------------
-
-IceLang::GenCPlusPlus::IceVisitor::IceVisitor(
-    Output& h, Output& c, const string& dllExport)
+Slice::Gen::IceVisitor::IceVisitor(Output& h, Output& c,
+				   const string& dllExport)
     : H(h), C(c), dllExport_(dllExport)
 {
 }
 
 void
-IceLang::GenCPlusPlus::IceVisitor::visitUnitStart(
-    const Parser_ptr& p)
+Slice::Gen::IceVisitor::visitUnitStart(const Parser_ptr& p)
 {
     if(!p -> hasClassDecls())
 	return;
@@ -1351,8 +1276,7 @@ IceLang::GenCPlusPlus::IceVisitor::visitUnitStart(
 }
 
 void
-IceLang::GenCPlusPlus::IceVisitor::visitUnitEnd(
-    const Parser_ptr& p)
+Slice::Gen::IceVisitor::visitUnitEnd(const Parser_ptr& p)
 {
     if(!p -> hasClassDecls())
 	return;
@@ -1362,8 +1286,7 @@ IceLang::GenCPlusPlus::IceVisitor::visitUnitEnd(
 }
     
 void
-IceLang::GenCPlusPlus::IceVisitor::visitClassDecl(
-    const ClassDecl_ptr& p)
+Slice::Gen::IceVisitor::visitClassDecl(const ClassDecl_ptr& p)
 {
     string scoped = p -> scoped();
     
@@ -1388,8 +1311,7 @@ IceLang::GenCPlusPlus::IceVisitor::visitClassDecl(
 }
 
 void
-IceLang::GenCPlusPlus::IceVisitor::visitClassDefStart(
-    const ClassDef_ptr& p)
+Slice::Gen::IceVisitor::visitClassDefStart(const ClassDef_ptr& p)
 {
     string scoped = p -> scoped();
     
@@ -1431,19 +1353,14 @@ IceLang::GenCPlusPlus::IceVisitor::visitClassDefStart(
     }
 }
 
-// ----------------------------------------------------------------------
-// HandleVisitor
-// ----------------------------------------------------------------------
-
-IceLang::GenCPlusPlus::HandleVisitor::HandleVisitor(
-    Output& h, Output& c, const string& dllExport)
+Slice::Gen::HandleVisitor::HandleVisitor(Output& h, Output& c,
+					 const string& dllExport)
     : H(h), C(c), dllExport_(dllExport)
 {
 }
 
 void
-IceLang::GenCPlusPlus::HandleVisitor::visitModuleStart(
-    const Module_ptr& p)
+Slice::Gen::HandleVisitor::visitModuleStart(const Module_ptr& p)
 {
     if(!p -> hasClassDecls())
 	return;
@@ -1455,8 +1372,7 @@ IceLang::GenCPlusPlus::HandleVisitor::visitModuleStart(
 }
 
 void
-IceLang::GenCPlusPlus::HandleVisitor::visitModuleEnd(
-    const Module_ptr& p)
+Slice::Gen::HandleVisitor::visitModuleEnd(const Module_ptr& p)
 {
     if(!p -> hasClassDecls())
 	return;
@@ -1466,8 +1382,7 @@ IceLang::GenCPlusPlus::HandleVisitor::visitModuleEnd(
 }
 
 void
-IceLang::GenCPlusPlus::HandleVisitor::visitClassDecl(
-    const ClassDecl_ptr& p)
+Slice::Gen::HandleVisitor::visitClassDecl(const ClassDecl_ptr& p)
 {
     string name = p -> name();
     string scoped = p -> scoped();
@@ -1488,8 +1403,7 @@ IceLang::GenCPlusPlus::HandleVisitor::visitClassDecl(
 }
 
 void
-IceLang::GenCPlusPlus::HandleVisitor::visitClassDefStart(
-    const ClassDef_ptr& p)
+Slice::Gen::HandleVisitor::visitClassDefStart(const ClassDef_ptr& p)
 {
     if(p -> local())
 	return;
diff --git a/cpp/src/slice2cpp/GenCPlusPlus.h b/cpp/src/slice2cpp/Gen.h
index c0b6b640cae..7e7b203e17f 100644
--- a/cpp/src/slice2cpp/GenCPlusPlus.h
+++ b/cpp/src/slice2cpp/Gen.h
@@ -8,25 +8,25 @@
 //
 // **********************************************************************
 
-#ifndef GEN_C_PLUS_PLUS_H
-#define GEN_C_PLUS_PLUS_H
+#ifndef GEN_H
+#define GEN_H
 
 #include <Parser.h>
 #include <OutputUtil.h>
 
-namespace IceLang
+namespace Slice
 {
 
-class GenCPlusPlus : ::__Ice::noncopyable
+class Gen : ::__Ice::noncopyable
 {
 public:
 
-    GenCPlusPlus(const std::string&,
-		 const std::string&,
-		 const std::string&,
-		 const std::vector<std::string>&,
-		 const std::string&);
-    ~GenCPlusPlus();
+    Gen(const std::string&,
+	const std::string&,
+	const std::string&,
+	const std::vector<std::string>&,
+	const std::string&);
+    ~Gen();
 
     bool operator!() const; // Returns true if there was a constructor error
 
diff --git a/cpp/src/slice2cpp/GenCPlusPlusUtil.h b/cpp/src/slice2cpp/GenCPlusPlusUtil.h
deleted file mode 100644
index 35eefdd4c3e..00000000000
--- a/cpp/src/slice2cpp/GenCPlusPlusUtil.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// MutableRealms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-#ifndef GEN_C_PLUS_PLUS_UTIL_H
-#define GEN_C_PLUS_PLUS_UTIL_H
-
-#include <Parser.h>
-#include <OutputUtil.h>
-
-namespace IceLang
-{
-
-std::string typeToString(const Type_ptr&);
-std::string returnTypeToString(const Type_ptr&);
-std::string inputTypeToString(const Type_ptr&);
-std::string outputTypeToString(const Type_ptr&);
-
-void writeMarshalUnmarshalCode(Output&, const Type_ptr&, const std::string&, bool);
-
-void writeMarshalCode(Output&,
-		      const std::list<std::pair<Type_ptr, std::string> >&,
-		      const Type_ptr&);
-
-void writeUnmarshalCode(Output&,
-			const std::list<std::pair<Type_ptr, std::string> >&,
-			const Type_ptr&);
-
-void writeAllocateCode(Output&,
-			const std::list<std::pair<Type_ptr, std::string> >&,
-			const Type_ptr&);
-
-}
-
-#endif
diff --git a/cpp/src/slice2cpp/GenCPlusPlusUtil.cpp b/cpp/src/slice2cpp/GenUtil.cpp
index 957cb0c0fd2..08eb26129d0 100644
--- a/cpp/src/slice2cpp/GenCPlusPlusUtil.cpp
+++ b/cpp/src/slice2cpp/GenUtil.cpp
@@ -8,13 +8,13 @@
 //
 // **********************************************************************
 
-#include <GenCPlusPlusUtil.h>
+#include <GenUtil.h>
 
 using namespace std;
-using namespace IceLang;
+using namespace Slice;
 
 string
-IceLang::typeToString(const Type_ptr& type)
+Slice::typeToString(const Type_ptr& type)
 {
     static const char* builtinTable[] =
     {
@@ -52,7 +52,7 @@ IceLang::typeToString(const Type_ptr& type)
 }
 
 string
-IceLang::returnTypeToString(const Type_ptr& type)
+Slice::returnTypeToString(const Type_ptr& type)
 {
     if(!type)
 	return "void";
@@ -61,7 +61,7 @@ IceLang::returnTypeToString(const Type_ptr& type)
 }
 
 string
-IceLang::inputTypeToString(const Type_ptr& type)
+Slice::inputTypeToString(const Type_ptr& type)
 {
     static const char* inputBuiltinTable[] =
     {
@@ -99,7 +99,7 @@ IceLang::inputTypeToString(const Type_ptr& type)
 }
 
 string
-IceLang::outputTypeToString(const Type_ptr& type)
+Slice::outputTypeToString(const Type_ptr& type)
 {
     static const char* outputBuiltinTable[] =
     {
@@ -137,7 +137,7 @@ IceLang::outputTypeToString(const Type_ptr& type)
 }
 
 void
-IceLang::writeMarshalUnmarshalCode(Output& out, const Type_ptr& type,
+Slice::writeMarshalUnmarshalCode(Output& out, const Type_ptr& type,
 				   const string& param, bool marshal)
 {
     const char* func = marshal ? "write(" : "read(";
@@ -212,7 +212,7 @@ IceLang::writeMarshalUnmarshalCode(Output& out, const Type_ptr& type,
 }
 
 void
-IceLang::writeMarshalCode(Output& out,
+Slice::writeMarshalCode(Output& out,
 			  const list<pair<Type_ptr, string> >& params,
 			  const Type_ptr& ret)
 {
@@ -224,7 +224,7 @@ IceLang::writeMarshalCode(Output& out,
 }
 
 void
-IceLang::writeUnmarshalCode(Output& out,
+Slice::writeUnmarshalCode(Output& out,
 			    const list<pair<Type_ptr, string> >& params,
 			    const Type_ptr& ret)
 {
@@ -236,7 +236,7 @@ IceLang::writeUnmarshalCode(Output& out,
 }
 
 void
-IceLang::writeAllocateCode(Output& out,
+Slice::writeAllocateCode(Output& out,
 			   const list<pair<Type_ptr, string> >& params,
 			   const Type_ptr& ret)
 {
diff --git a/cpp/src/slice2cpp/GenUtil.h b/cpp/src/slice2cpp/GenUtil.h
index 824b00ef142..bea707b983d 100644
--- a/cpp/src/slice2cpp/GenUtil.h
+++ b/cpp/src/slice2cpp/GenUtil.h
@@ -14,7 +14,7 @@
 #include <Parser.h>
 #include <OutputUtil.h>
 
-namespace IceLang
+namespace Slice
 {
 
 std::string typeToString(const Type_ptr&);
@@ -22,7 +22,10 @@ std::string returnTypeToString(const Type_ptr&);
 std::string inputTypeToString(const Type_ptr&);
 std::string outputTypeToString(const Type_ptr&);
 
-void writeMarshalUnmarshalCode(Output&, const Type_ptr&, const std::string&, bool);
+void writeMarshalUnmarshalCode(Output&,
+			       const Type_ptr&,
+			       const std::string&,
+			       bool);
 
 void writeMarshalCode(Output&,
 		      const std::list<std::pair<Type_ptr, std::string> >&,
diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp
index 4915c2a0600..63236fb8225 100644
--- a/cpp/src/slice2cpp/Main.cpp
+++ b/cpp/src/slice2cpp/Main.cpp
@@ -8,11 +8,11 @@
 //
 // **********************************************************************
 
-#include <GenCPlusPlus.h>
+#include <Gen.h>
 #include <fstream>
 
 using namespace std;
-using namespace IceLang;
+using namespace Slice;
 
 void
 usage(const char* n)
@@ -180,7 +180,7 @@ main(int argc, char* argv[])
 	if(status == EXIT_FAILURE)
 	    return status;
 
-	GenCPlusPlus gen(argv[0], base, include, includePaths, dllExport);
+	Gen gen(argv[0], base, include, includePaths, dllExport);
 	if(!gen)
 	    return EXIT_FAILURE;
 	gen.generate(parser);
diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile
index fee98be25d5..e82b5ebeca3 100644
--- a/cpp/src/slice2cpp/Makefile
+++ b/cpp/src/slice2cpp/Makefile
@@ -14,8 +14,8 @@ NAME		= $(top_srcdir)/bin/slice2cpp
 
 TARGETS		= $(NAME)
 
-OBJS		= GenCPlusPlus.o \
-		  GenCPlusPlusUtil.o \
+OBJS		= Gen.o \
+		  GenUtil.o \
 		  Main.o
 
 SRCS		= $(OBJS:.o=.cpp)