3 files changed, 17 insertions, 17 deletions
diff --git a/Source/CPack/cmCPackGenerators.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx
index d9f3301..a15217b 100644
--- a/Source/CPack/cmCPackGenerators.cxx
+++ b/Source/CPack/cmCPackGeneratorFactory.cxx
@@ -15,7 +15,7 @@
 
 =========================================================================*/
 
-#include "cmCPackGenerators.h"
+#include "cmCPackGeneratorFactory.h"
 
 #include "cmCPackGenericGenerator.h"
 #include "cmCPackTGZGenerator.h"
@@ -44,7 +44,7 @@
 #include "cmCPackLog.h"
 
 //----------------------------------------------------------------------
-cmCPackGenerators::cmCPackGenerators()
+cmCPackGeneratorFactory::cmCPackGeneratorFactory()
 {
   this->RegisterGenerator("TGZ", "Tar GZip compression",
     cmCPackTGZGenerator::CreateGenerator);
@@ -81,7 +81,7 @@ cmCPackGenerators::cmCPackGenerators()
 }
 
 //----------------------------------------------------------------------
-cmCPackGenerators::~cmCPackGenerators()
+cmCPackGeneratorFactory::~cmCPackGeneratorFactory()
 {
   std::vector<cmCPackGenericGenerator*>::iterator it;
   for ( it = this->Generators.begin(); it != this->Generators.end(); ++ it )
@@ -91,7 +91,7 @@ cmCPackGenerators::~cmCPackGenerators()
 }
 
 //----------------------------------------------------------------------
-cmCPackGenericGenerator* cmCPackGenerators::NewGenerator(const char* name)
+cmCPackGenericGenerator* cmCPackGeneratorFactory::NewGenerator(const char* name)
 {
   cmCPackGenericGenerator* gen = this->NewGeneratorInternal(name);
   if ( !gen )
@@ -104,14 +104,14 @@ cmCPackGenericGenerator* cmCPackGenerators::NewGenerator(const char* name)
 }
 
 //----------------------------------------------------------------------
-cmCPackGenericGenerator* cmCPackGenerators::NewGeneratorInternal(
+cmCPackGenericGenerator* cmCPackGeneratorFactory::NewGeneratorInternal(
   const char* name)
 {
   if ( !name )
     {
     return 0;
     }
-  cmCPackGenerators::t_GeneratorCreatorsMap::iterator it
+  cmCPackGeneratorFactory::t_GeneratorCreatorsMap::iterator it
     = this->GeneratorCreators.find(name);
   if ( it == this->GeneratorCreators.end() )
     {
@@ -121,7 +121,7 @@ cmCPackGenericGenerator* cmCPackGenerators::NewGeneratorInternal(
 }
 
 //----------------------------------------------------------------------
-void cmCPackGenerators::RegisterGenerator(const char* name,
+void cmCPackGeneratorFactory::RegisterGenerator(const char* name,
   const char* generatorDescription,
   CreateGeneratorCall* createGenerator)
 {
diff --git a/Source/CPack/cmCPackGenerators.h b/Source/CPack/cmCPackGeneratorFactory.h
index 76a1697..4dcc55e 100644
--- a/Source/CPack/cmCPackGenerators.h
+++ b/Source/CPack/cmCPackGeneratorFactory.h
@@ -15,25 +15,25 @@
 
 =========================================================================*/
 
-#ifndef cmCPackGenerators_h
-#define cmCPackGenerators_h
+#ifndef cmCPackGeneratorFactory_h
+#define cmCPackGeneratorFactory_h
 
 #include "cmObject.h"
 
 class cmCPackLog;
 class cmCPackGenericGenerator;
 
-/** \class cmCPackGenerators
+/** \class cmCPackGeneratorFactory
  * \brief A container for CPack generators
  *
  */
-class cmCPackGenerators : public cmObject
+class cmCPackGeneratorFactory : public cmObject
 {
 public:
-  cmTypeMacro(cmCPackGenerators, cmObject);
+  cmTypeMacro(cmCPackGeneratorFactory, cmObject);
 
-  cmCPackGenerators();
-  ~cmCPackGenerators();
+  cmCPackGeneratorFactory();
+  ~cmCPackGeneratorFactory();
 
   //! Get the generator
   cmCPackGenericGenerator* NewGenerator(const char* name);
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index bb071e9..12585e3 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -19,7 +19,7 @@
 // Need these for documentation support.
 #include "cmake.h"
 #include "cmDocumentation.h"
-#include "cmCPackGenerators.h"
+#include "cmCPackGeneratorFactory.h"
 #include "cmCPackGenericGenerator.h"
 #include "cmake.h"
 #include "cmGlobalGenerator.h"
@@ -232,7 +232,7 @@ int main (int argc, char *argv[])
     cpackConfigFileSpecified = false;
     }
 
-  cmCPackGenerators generators;
+  cmCPackGeneratorFactory generators;
   generators.SetLogger(&log);
   cmCPackGenericGenerator* cpackGenerator = 0;
 
@@ -453,7 +453,7 @@ int main (int argc, char *argv[])
     doc.SetSection("Options",cmDocumentationOptions);
 
     std::vector<cmDocumentationEntry> v;
-    cmCPackGenerators::DescriptionsMap::const_iterator generatorIt;
+    cmCPackGeneratorFactory::DescriptionsMap::const_iterator generatorIt;
     for( generatorIt = generators.GetGeneratorsList().begin();
       generatorIt != generators.GetGeneratorsList().end();
       ++ generatorIt )