diff --git a/Etabs_Adapter/AdapterActions/Execute.cs b/ETABS_Adapter/AdapterActions/Execute.cs
similarity index 100%
rename from Etabs_Adapter/AdapterActions/Execute.cs
rename to ETABS_Adapter/AdapterActions/Execute.cs
diff --git a/Etabs_Adapter/CRUD/Create/Bar.cs b/ETABS_Adapter/CRUD/Create/Bar.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Create/Bar.cs
rename to ETABS_Adapter/CRUD/Create/Bar.cs
diff --git a/Etabs_Adapter/CRUD/Create/Diaphragm.cs b/ETABS_Adapter/CRUD/Create/Diaphragm.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Create/Diaphragm.cs
rename to ETABS_Adapter/CRUD/Create/Diaphragm.cs
diff --git a/Etabs_Adapter/CRUD/Create/Error.cs b/ETABS_Adapter/CRUD/Create/Error.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Create/Error.cs
rename to ETABS_Adapter/CRUD/Create/Error.cs
diff --git a/Etabs_Adapter/CRUD/Create/Level.cs b/ETABS_Adapter/CRUD/Create/Level.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Create/Level.cs
rename to ETABS_Adapter/CRUD/Create/Level.cs
diff --git a/Etabs_Adapter/CRUD/Create/Link.cs b/ETABS_Adapter/CRUD/Create/Link.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Create/Link.cs
rename to ETABS_Adapter/CRUD/Create/Link.cs
diff --git a/Etabs_Adapter/CRUD/Create/Load.cs b/ETABS_Adapter/CRUD/Create/Load.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Create/Load.cs
rename to ETABS_Adapter/CRUD/Create/Load.cs
diff --git a/Etabs_Adapter/CRUD/Create/Loadcase.cs b/ETABS_Adapter/CRUD/Create/Loadcase.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Create/Loadcase.cs
rename to ETABS_Adapter/CRUD/Create/Loadcase.cs
diff --git a/Etabs_Adapter/CRUD/Create/Material.cs b/ETABS_Adapter/CRUD/Create/Material.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Create/Material.cs
rename to ETABS_Adapter/CRUD/Create/Material.cs
diff --git a/Etabs_Adapter/CRUD/Create/Node.cs b/ETABS_Adapter/CRUD/Create/Node.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Create/Node.cs
rename to ETABS_Adapter/CRUD/Create/Node.cs
diff --git a/Etabs_Adapter/CRUD/Create/Opening.cs b/ETABS_Adapter/CRUD/Create/Opening.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Create/Opening.cs
rename to ETABS_Adapter/CRUD/Create/Opening.cs
diff --git a/Etabs_Adapter/CRUD/Create/Panel.cs b/ETABS_Adapter/CRUD/Create/Panel.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Create/Panel.cs
rename to ETABS_Adapter/CRUD/Create/Panel.cs
diff --git a/Etabs_Adapter/CRUD/Create/SectionProperty.cs b/ETABS_Adapter/CRUD/Create/SectionProperty.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Create/SectionProperty.cs
rename to ETABS_Adapter/CRUD/Create/SectionProperty.cs
diff --git a/Etabs_Adapter/CRUD/Create/SurfaceProperty.cs b/ETABS_Adapter/CRUD/Create/SurfaceProperty.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Create/SurfaceProperty.cs
rename to ETABS_Adapter/CRUD/Create/SurfaceProperty.cs
diff --git a/Etabs_Adapter/CRUD/Create/_Create.cs b/ETABS_Adapter/CRUD/Create/_Create.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Create/_Create.cs
rename to ETABS_Adapter/CRUD/Create/_Create.cs
diff --git a/Etabs_Adapter/CRUD/Delete/_Delete.cs b/ETABS_Adapter/CRUD/Delete/_Delete.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Delete/_Delete.cs
rename to ETABS_Adapter/CRUD/Delete/_Delete.cs
diff --git a/Etabs_Adapter/CRUD/Read/Bar.cs b/ETABS_Adapter/CRUD/Read/Bar.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/Bar.cs
rename to ETABS_Adapter/CRUD/Read/Bar.cs
diff --git a/Etabs_Adapter/CRUD/Read/Grid.cs b/ETABS_Adapter/CRUD/Read/Grid.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/Grid.cs
rename to ETABS_Adapter/CRUD/Read/Grid.cs
diff --git a/Etabs_Adapter/CRUD/Read/Level.cs b/ETABS_Adapter/CRUD/Read/Level.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/Level.cs
rename to ETABS_Adapter/CRUD/Read/Level.cs
diff --git a/Etabs_Adapter/CRUD/Read/Link.cs b/ETABS_Adapter/CRUD/Read/Link.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/Link.cs
rename to ETABS_Adapter/CRUD/Read/Link.cs
diff --git a/Etabs_Adapter/CRUD/Read/Load.cs b/ETABS_Adapter/CRUD/Read/Load.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/Load.cs
rename to ETABS_Adapter/CRUD/Read/Load.cs
diff --git a/Etabs_Adapter/CRUD/Read/Loadcase.cs b/ETABS_Adapter/CRUD/Read/Loadcase.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/Loadcase.cs
rename to ETABS_Adapter/CRUD/Read/Loadcase.cs
diff --git a/Etabs_Adapter/CRUD/Read/Material.cs b/ETABS_Adapter/CRUD/Read/Material.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/Material.cs
rename to ETABS_Adapter/CRUD/Read/Material.cs
diff --git a/Etabs_Adapter/CRUD/Read/Mesh.cs b/ETABS_Adapter/CRUD/Read/Mesh.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/Mesh.cs
rename to ETABS_Adapter/CRUD/Read/Mesh.cs
diff --git a/Etabs_Adapter/CRUD/Read/Node.cs b/ETABS_Adapter/CRUD/Read/Node.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/Node.cs
rename to ETABS_Adapter/CRUD/Read/Node.cs
diff --git a/Etabs_Adapter/CRUD/Read/Opening.cs b/ETABS_Adapter/CRUD/Read/Opening.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/Opening.cs
rename to ETABS_Adapter/CRUD/Read/Opening.cs
diff --git a/Etabs_Adapter/CRUD/Read/Panel.cs b/ETABS_Adapter/CRUD/Read/Panel.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/Panel.cs
rename to ETABS_Adapter/CRUD/Read/Panel.cs
diff --git a/Etabs_Adapter/CRUD/Read/Results/BarResults.cs b/ETABS_Adapter/CRUD/Read/Results/BarResults.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/Results/BarResults.cs
rename to ETABS_Adapter/CRUD/Read/Results/BarResults.cs
diff --git a/Etabs_Adapter/CRUD/Read/Results/GlobalResults.cs b/ETABS_Adapter/CRUD/Read/Results/GlobalResults.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/Results/GlobalResults.cs
rename to ETABS_Adapter/CRUD/Read/Results/GlobalResults.cs
diff --git a/Etabs_Adapter/CRUD/Read/Results/MeshResults.cs b/ETABS_Adapter/CRUD/Read/Results/MeshResults.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/Results/MeshResults.cs
rename to ETABS_Adapter/CRUD/Read/Results/MeshResults.cs
diff --git a/Etabs_Adapter/CRUD/Read/Results/NodeResults.cs b/ETABS_Adapter/CRUD/Read/Results/NodeResults.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/Results/NodeResults.cs
rename to ETABS_Adapter/CRUD/Read/Results/NodeResults.cs
diff --git a/Etabs_Adapter/CRUD/Read/Results/PierAndSpandrelResults.cs b/ETABS_Adapter/CRUD/Read/Results/PierAndSpandrelResults.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/Results/PierAndSpandrelResults.cs
rename to ETABS_Adapter/CRUD/Read/Results/PierAndSpandrelResults.cs
diff --git a/Etabs_Adapter/CRUD/Read/Results/Result.cs b/ETABS_Adapter/CRUD/Read/Results/Result.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/Results/Result.cs
rename to ETABS_Adapter/CRUD/Read/Results/Result.cs
diff --git a/Etabs_Adapter/CRUD/Read/SectionProperty.cs b/ETABS_Adapter/CRUD/Read/SectionProperty.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/SectionProperty.cs
rename to ETABS_Adapter/CRUD/Read/SectionProperty.cs
diff --git a/Etabs_Adapter/CRUD/Read/SurfaceProperty.cs b/ETABS_Adapter/CRUD/Read/SurfaceProperty.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/SurfaceProperty.cs
rename to ETABS_Adapter/CRUD/Read/SurfaceProperty.cs
diff --git a/Etabs_Adapter/CRUD/Read/_Read.cs b/ETABS_Adapter/CRUD/Read/_Read.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Read/_Read.cs
rename to ETABS_Adapter/CRUD/Read/_Read.cs
diff --git a/Etabs_Adapter/CRUD/Update/Bar.cs b/ETABS_Adapter/CRUD/Update/Bar.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Update/Bar.cs
rename to ETABS_Adapter/CRUD/Update/Bar.cs
diff --git a/Etabs_Adapter/CRUD/Update/Material.cs b/ETABS_Adapter/CRUD/Update/Material.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Update/Material.cs
rename to ETABS_Adapter/CRUD/Update/Material.cs
diff --git a/Etabs_Adapter/CRUD/Update/Node.cs b/ETABS_Adapter/CRUD/Update/Node.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Update/Node.cs
rename to ETABS_Adapter/CRUD/Update/Node.cs
diff --git a/Etabs_Adapter/CRUD/Update/Panel.cs b/ETABS_Adapter/CRUD/Update/Panel.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Update/Panel.cs
rename to ETABS_Adapter/CRUD/Update/Panel.cs
diff --git a/Etabs_Adapter/CRUD/Update/SectionProperty.cs b/ETABS_Adapter/CRUD/Update/SectionProperty.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Update/SectionProperty.cs
rename to ETABS_Adapter/CRUD/Update/SectionProperty.cs
diff --git a/Etabs_Adapter/CRUD/Update/SurfaceProperty.cs b/ETABS_Adapter/CRUD/Update/SurfaceProperty.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Update/SurfaceProperty.cs
rename to ETABS_Adapter/CRUD/Update/SurfaceProperty.cs
diff --git a/Etabs_Adapter/CRUD/Update/_Update.cs b/ETABS_Adapter/CRUD/Update/_Update.cs
similarity index 100%
rename from Etabs_Adapter/CRUD/Update/_Update.cs
rename to ETABS_Adapter/CRUD/Update/_Update.cs
diff --git a/Etabs_Adapter/Convert/FromCSI/Panel.cs b/ETABS_Adapter/Convert/FromCSI/Panel.cs
similarity index 100%
rename from Etabs_Adapter/Convert/FromCSI/Panel.cs
rename to ETABS_Adapter/Convert/FromCSI/Panel.cs
diff --git a/Etabs_Adapter/Convert/FromCSI/Vector.cs b/ETABS_Adapter/Convert/FromCSI/Vector.cs
similarity index 100%
rename from Etabs_Adapter/Convert/FromCSI/Vector.cs
rename to ETABS_Adapter/Convert/FromCSI/Vector.cs
diff --git a/Etabs_Adapter/Convert/ToCSI/BarRelease.cs b/ETABS_Adapter/Convert/ToCSI/BarRelease.cs
similarity index 100%
rename from Etabs_Adapter/Convert/ToCSI/BarRelease.cs
rename to ETABS_Adapter/Convert/ToCSI/BarRelease.cs
diff --git a/Etabs_Adapter/Convert/ToCSI/Constraint6DOF.cs b/ETABS_Adapter/Convert/ToCSI/Constraint6DOF.cs
similarity index 100%
rename from Etabs_Adapter/Convert/ToCSI/Constraint6DOF.cs
rename to ETABS_Adapter/Convert/ToCSI/Constraint6DOF.cs
diff --git a/Etabs_Adapter/Convert/ToCSI/Panel.cs b/ETABS_Adapter/Convert/ToCSI/Panel.cs
similarity index 100%
rename from Etabs_Adapter/Convert/ToCSI/Panel.cs
rename to ETABS_Adapter/Convert/ToCSI/Panel.cs
diff --git a/Etabs_Adapter/Convert/ToCSI/Vector.cs b/ETABS_Adapter/Convert/ToCSI/Vector.cs
similarity index 100%
rename from Etabs_Adapter/Convert/ToCSI/Vector.cs
rename to ETABS_Adapter/Convert/ToCSI/Vector.cs
diff --git a/Etabs_Adapter/ETABSAdapter.cs b/ETABS_Adapter/ETABSAdapter.cs
similarity index 100%
rename from Etabs_Adapter/ETABSAdapter.cs
rename to ETABS_Adapter/ETABSAdapter.cs
diff --git a/Etabs_Adapter/Etabs_Adapter.csproj b/ETABS_Adapter/ETABS_Adapter.csproj
similarity index 99%
rename from Etabs_Adapter/Etabs_Adapter.csproj
rename to ETABS_Adapter/ETABS_Adapter.csproj
index ce6419c3..07a4b384 100644
--- a/Etabs_Adapter/Etabs_Adapter.csproj
+++ b/ETABS_Adapter/ETABS_Adapter.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BH.Adapter.ETABS</RootNamespace>
-    <AssemblyName>Etabs2016_Adapter</AssemblyName>
+    <AssemblyName>ETABS2016_Adapter</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -42,7 +42,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BH.Adapter.ETABS</RootNamespace>
-    <AssemblyName>Etabs2016_Adapter</AssemblyName>
+    <AssemblyName>ETABS2016_Adapter</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -96,7 +96,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <AssemblyName>Etabs2016_Adapter</AssemblyName>
+    <AssemblyName>ETABS2016_Adapter</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release17|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -146,7 +146,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <AssemblyName>Etabs_Adapter</AssemblyName>
+    <AssemblyName>ETABS_Adapter</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug16|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Etabs_Adapter/Properties/AssemblyInfo.cs b/ETABS_Adapter/Properties/AssemblyInfo.cs
similarity index 100%
rename from Etabs_Adapter/Properties/AssemblyInfo.cs
rename to ETABS_Adapter/Properties/AssemblyInfo.cs
diff --git a/Etabs_Adapter/Types/Comparer.cs b/ETABS_Adapter/Types/Comparer.cs
similarity index 100%
rename from Etabs_Adapter/Types/Comparer.cs
rename to ETABS_Adapter/Types/Comparer.cs
diff --git a/Etabs_Adapter/Types/DependencyTypes.cs b/ETABS_Adapter/Types/DependencyTypes.cs
similarity index 100%
rename from Etabs_Adapter/Types/DependencyTypes.cs
rename to ETABS_Adapter/Types/DependencyTypes.cs
diff --git a/Etabs_Adapter/Types/NextIndex.cs b/ETABS_Adapter/Types/NextIndex.cs
similarity index 100%
rename from Etabs_Adapter/Types/NextIndex.cs
rename to ETABS_Adapter/Types/NextIndex.cs
diff --git a/Etabs_Adapter/Types/PriorityTypes.cs b/ETABS_Adapter/Types/PriorityTypes.cs
similarity index 100%
rename from Etabs_Adapter/Types/PriorityTypes.cs
rename to ETABS_Adapter/Types/PriorityTypes.cs
diff --git a/Etabs_Adapter/packages.config b/ETABS_Adapter/packages.config
similarity index 100%
rename from Etabs_Adapter/packages.config
rename to ETABS_Adapter/packages.config