diff --git a/Examples/States/Client.cs b/Examples/States/Client.cs
index 332ba41..77d2148 100644
--- a/Examples/States/Client.cs
+++ b/Examples/States/Client.cs
@@ -5,7 +5,7 @@ using System.Threading;
 using IRCStates;
 using IRCTokens;
 
-namespace StatesSample
+namespace States
 {
     internal class Client
     {
diff --git a/Examples/States/Program.cs b/Examples/States/Program.cs
index 8ad7bf7..3c98b23 100644
--- a/Examples/States/Program.cs
+++ b/Examples/States/Program.cs
@@ -1,4 +1,4 @@
-namespace StatesSample
+namespace States
 {
     public static class Program
     {
diff --git a/Examples/States/StatesSample.csproj b/Examples/States/States.csproj
similarity index 100%
rename from Examples/States/StatesSample.csproj
rename to Examples/States/States.csproj
diff --git a/Examples/Tokens/Client.cs b/Examples/Tokens/Client.cs
index 5ad0cf0..8168a22 100644
--- a/Examples/Tokens/Client.cs
+++ b/Examples/Tokens/Client.cs
@@ -3,7 +3,7 @@ using System.Net.Sockets;
 using System.Threading;
 using IRCTokens;
 
-namespace TokensSample
+namespace Tokens
 {
     public class Client
     {
diff --git a/Examples/Tokens/Program.cs b/Examples/Tokens/Program.cs
index e157e31..9f31dbd 100644
--- a/Examples/Tokens/Program.cs
+++ b/Examples/Tokens/Program.cs
@@ -1,7 +1,7 @@
 using System;
 using IRCTokens;
 
-namespace TokensSample
+namespace Tokens
 {
     public class Program
     {
diff --git a/Examples/Tokens/TokensSample.csproj b/Examples/Tokens/Tokens.csproj
similarity index 100%
rename from Examples/Tokens/TokensSample.csproj
rename to Examples/Tokens/Tokens.csproj
diff --git a/IRCSharp.sln b/IRCSharp.sln
index 1a79759..4f1539a 100644
--- a/IRCSharp.sln
+++ b/IRCSharp.sln
@@ -5,11 +5,11 @@ VisualStudioVersion = 16.0.30011.22
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRCTokens", "IRCTokens\IRCTokens.csproj", "{9E812F45-B2CD-42D2-8378-EBEBF8697905}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TokensSample", "Examples\Tokens\TokensSample.csproj", "{A45DA39B-6B47-4713-8049-3B36E0235B67}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tokens", "Examples\Tokens\Tokens.csproj", "{A45DA39B-6B47-4713-8049-3B36E0235B67}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IRCStates", "IRCStates\IRCStates.csproj", "{233E3CB4-61F1-4368-9139-7E9F4A58ED2D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StatesSample", "Examples\States\StatesSample.csproj", "{BC9F6696-9D83-4F7A-9E15-CE4D3626C1AF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "States", "Examples\States\States.csproj", "{BC9F6696-9D83-4F7A-9E15-CE4D3626C1AF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1A85EB22-D7B4-417F-AC3B-DAFD97DDEA08}"
 	ProjectSection(SolutionItems) = preProject