diff --git a/.travis.yml b/.travis.yml
index 2c6dcb93..452a8a23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: csharp
-solution: src/IniFileParser.sln
+solution: src/IniParser.sln
 
 install:
   - ./install.sh
diff --git a/README.md b/README.md
index 32b771a7..7dcaaf60 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@ data["UI"]["fullscreen"] = "true";
 parser.WriteFile("Configuration.ini", data);
 ```
 
-Head to the [wiki](https://github.com/rickyah/ini-parser/wiki) for more usage examples, or [check out the code of the example project](https://github.com/rickyah/ini-parser/blob/development/src/IniFileParser.Example/Program.cs)
+Head to the [wiki](https://github.com/rickyah/ini-parser/wiki) for more usage examples, or [check out the code of the example project](https://github.com/rickyah/ini-parser/blob/development/src/IniParser.Example/Program.cs)
 
 
 ## Merging ini files
diff --git a/bin/bump-version b/bin/bump-version
index dd540fd0..c0b80889 100755
--- a/bin/bump-version
+++ b/bin/bump-version
@@ -46,7 +46,7 @@ case $COMMAND in
     list)
         if [ -z "$FILE_PATH" ]
         then
-            FILE_PATH="./src/IniFileParser/Properties/AssemblyInfo.cs"
+            FILE_PATH="./src/IniParser/Properties/AssemblyInfo.cs"
         fi
         
         eval $LIST_CMD
@@ -61,7 +61,7 @@ case $COMMAND in
 
         if [ -z "$FILE_PATH" ]
         then
-            FILE_PATH="./src/IniFileParser/Properties/AssemblyInfo.cs"
+            FILE_PATH="./src/IniParser/Properties/AssemblyInfo.cs"
         fi
 
         NEW_VERSION_REPLACE1='\[assembly: AssemblyVersion\("'$NEW_VERSION'"\)\]'
@@ -79,7 +79,7 @@ case $COMMAND in
         eval $LIST_CMD
 
         printf 'Saving change to git'
-        git add ./src/IniFileParser/Properties/AssemblyInfo.cs
+        git add ./src/IniParser/Properties/AssemblyInfo.cs
         git cm "Bumping version to $NEW_VERSION"
     ;;
 esac
diff --git a/bin/nuget-pack b/bin/nuget-pack
index 66156180..412e1386 100755
--- a/bin/nuget-pack
+++ b/bin/nuget-pack
@@ -5,14 +5,14 @@ nuget restore src/INIFileParser.sln
 xbuild src/INIFileParser.sln /nologo /verbosity:normal /p:Configuration=Release
 
 # run tests
-mono ./src/packages/NUnit.Runners.2.6.4/tools/nunit-console.exe -noxml -nodots -labels ./src/IniFileParser.Tests/bin/Release/IniFileParser.Tests.dll
+mono ./src/packages/NUnit.Runners.2.6.4/tools/nunit-console.exe -noxml -nodots -labels ./src/IniParser.Tests/bin/Release/IniParser.Tests.dll
 
 # strong sign assembly
-sn -R lib/INIFileParser.dll ./src/IniFileParser/Properties/publickey.snk
+sn -R lib/INIFileParser.dll ./src/IniParser/Properties/publickey.snk
 
 mkdir -p build
 
 VERSION=$(monodis --assembly lib/INIFileParser.dll | grep Version | cut -d':' -f2 | tr -d ' ' | cut -c1-5)
 
 # generate the nuget package
-mono --runtime=v4.0 ~/bin/NuGet.exe pack ./src/IniFileParser/INIFileParser.nuspec -NoDefaultExcludes -OutputDirectory ./build -Version $VERSION
+mono --runtime=v4.0 ~/bin/NuGet.exe pack ./src/IniParser/INIFileParser.nuspec -NoDefaultExcludes -OutputDirectory ./build -Version $VERSION
diff --git a/src/DocumentationBuilder.shfb b/src/DocumentationBuilder.shfb
index ebb6a188..3932f6a5 100644
--- a/src/DocumentationBuilder.shfb
+++ b/src/DocumentationBuilder.shfb
@@ -1,6 +1,6 @@
 <project schemaVersion="1.6.0.7">
     <assemblies>
-        <assembly assemblyPath=".\build\IniFileParser.dll" xmlCommentsPath=".\build\IniFileParser.xml" commentsOnly="False" />
+        <assembly assemblyPath=".\build\IniParser.dll" xmlCommentsPath=".\build\IniParser.xml" commentsOnly="False" />
     </assemblies>
     <namespaceSummaries>
         <namespaceSummaryItem name="" isDocumented="False" />
@@ -28,7 +28,7 @@ An implementation for reading / writing INI data to streams, files and strings i
     <RootNamespaceContainer>False</RootNamespaceContainer>
     <RootNamespaceTitle />
     <HelpTitle>A simple C# library for reading and writing INI files</HelpTitle>
-    <HtmlHelpName>IniFileParserDocumentation</HtmlHelpName>
+    <HtmlHelpName>IniParserDocumentation</HtmlHelpName>
     <Language>en-US</Language>
     <CopyrightHref />
     <CopyrightText />