diff --git a/LCG-UDG/Generation/CSharpUtils.cs b/LCG-UDG/Generation/GenerationUtils.cs
similarity index 99%
rename from LCG-UDG/Generation/CSharpUtils.cs
rename to LCG-UDG/Generation/GenerationUtils.cs
index 931c097..32c00d1 100644
--- a/LCG-UDG/Generation/CSharpUtils.cs
+++ b/LCG-UDG/Generation/GenerationUtils.cs
@@ -6,9 +6,9 @@
 
 namespace Rappen.XTB.LCG
 {
-    public class CSharpUtils
+    public class GenerationUtils
     {
-        public static bool GenerateClasses(List<EntityMetadataProxy> entitiesmetadata, Settings settings, IConstantFileWriter fileWriter)
+        public static bool GenerateFiles(List<EntityMetadataProxy> entitiesmetadata, Settings settings, IConstantFileWriter fileWriter)
         {
             var selectedentities = entitiesmetadata.Where(e => e.Selected).ToList();
             var commonentity = GetCommonEntity(selectedentities, settings);
diff --git a/LCG-UDG/LCG-UDG-Common.csproj b/LCG-UDG/LCG-UDG-Common.csproj
index 966e7a3..4ebf36b 100644
--- a/LCG-UDG/LCG-UDG-Common.csproj
+++ b/LCG-UDG/LCG-UDG-Common.csproj
@@ -173,7 +173,7 @@
     <Compile Include="FormatDialogLCG.Designer.cs">
       <DependentUpon>FormatDialogLCG.cs</DependentUpon>
     </Compile>
-    <Compile Include="Generation\CSharpUtils.cs" />
+    <Compile Include="Generation\GenerationUtils.cs" />
     <Compile Include="Metadata\EntityMetadataProxy.cs" />
     <Compile Include="Settings\CommonSettings.cs" />
     <Compile Include="Generation\Extensions.cs" />
diff --git a/LCG-UDG/LCG.cs b/LCG-UDG/LCG.cs
index 13e0fb3..32ae27b 100644
--- a/LCG-UDG/LCG.cs
+++ b/LCG-UDG/LCG.cs
@@ -120,7 +120,7 @@ private void btnGenerate_Click(object sender, EventArgs e)
             GetSettingsFromUI();
             GetSelectionFromUI();
             var filewriter = settings.GetWriter(ConnectionDetail.WebApplicationUrl);
-            if (CSharpUtils.GenerateClasses(entities, settings, filewriter))
+            if (GenerationUtils.GenerateFiles(entities, settings, filewriter))
             {
                 var message = filewriter.GetResult(settings);
                 if (isUML)
diff --git a/LCGCmd/LCGHelper.cs b/LCGCmd/LCGHelper.cs
index 9f322e8..76ea5fc 100644
--- a/LCGCmd/LCGHelper.cs
+++ b/LCGCmd/LCGHelper.cs
@@ -45,7 +45,7 @@ public void GenerateConstants()
             LoadEntities();
             RestoreSelectedEntities();
             var writer = Settings.GetWriter(this.crmConnection.WebApplicationUrl);
-            if (CSharpUtils.GenerateClasses(entities, Settings, writer))
+            if (GenerationUtils.GenerateFiles(entities, Settings, writer))
             {
                 Console.Write(writer.GetResult(Settings));
             }
diff --git a/LCGTests/CSharpUtilTests.cs b/LCGTests/CSharpUtilTests.cs
index 8872c11..1e6964c 100644
--- a/LCGTests/CSharpUtilTests.cs
+++ b/LCGTests/CSharpUtilTests.cs
@@ -27,7 +27,7 @@ public void GenerateClasses_ForEmptyMetadata_Should_GenerateLogicalName()
                 .Invokes((Settings s, string e, string f) => { entity = e; });
             
             // Act
-            CSharpUtils.GenerateClasses(values, settings, fakeWriter);
+            GenerationUtils.GenerateFiles(values, settings, fakeWriter);
 
             // Assert
             config.MustHaveHappened();