diff --git a/VeekunImport/Form1.Designer.cs b/VeekunImport/Form1.Designer.cs
index 90106ef7..9ece7a40 100644
--- a/VeekunImport/Form1.Designer.cs
+++ b/VeekunImport/Form1.Designer.cs
@@ -1,4 +1,4 @@
-namespace PokeFoundations.VeekunImport
+namespace PkmnFoundations.VeekunImport
 {
     partial class Form1
     {
diff --git a/VeekunImport/Form1.cs b/VeekunImport/Form1.cs
index 5f538af8..15981cb7 100644
--- a/VeekunImport/Form1.cs
+++ b/VeekunImport/Form1.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-namespace PokeFoundations.VeekunImport
+namespace PkmnFoundations.VeekunImport
 {
     public partial class Form1 : Form
     {
diff --git a/VeekunImport/Program.cs b/VeekunImport/Program.cs
index 58f1c349..313d301b 100644
--- a/VeekunImport/Program.cs
+++ b/VeekunImport/Program.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Windows.Forms;
 using System.Diagnostics;
 
-namespace PokeFoundations.VeekunImport
+namespace PkmnFoundations.VeekunImport
 {
     static class Program
     {
diff --git a/VeekunImport/Properties/Resources.Designer.cs b/VeekunImport/Properties/Resources.Designer.cs
index 90eafaa1..48892dcc 100644
--- a/VeekunImport/Properties/Resources.Designer.cs
+++ b/VeekunImport/Properties/Resources.Designer.cs
@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.225
+//     Runtime Version:4.0.30319.34014
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace PokeFoundations.VeekunImport.Properties {
+namespace PkmnFoundations.VeekunImport.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace PokeFoundations.VeekunImport.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PokeFoundations.VeekunImport.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PkmnFoundations.VeekunImport.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/VeekunImport/Properties/Settings.Designer.cs b/VeekunImport/Properties/Settings.Designer.cs
index 4359ee2f..d5dbb65c 100644
--- a/VeekunImport/Properties/Settings.Designer.cs
+++ b/VeekunImport/Properties/Settings.Designer.cs
@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.225
+//     Runtime Version:4.0.30319.34014
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace PokeFoundations.VeekunImport.Properties {
+namespace PkmnFoundations.VeekunImport.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
diff --git a/VeekunImport/VeekunImport.csproj b/VeekunImport/VeekunImport.csproj
index 3f067f28..3c091e76 100644
--- a/VeekunImport/VeekunImport.csproj
+++ b/VeekunImport/VeekunImport.csproj
@@ -8,7 +8,7 @@
     <ProjectGuid>{024BA6DC-E146-405E-B028-2B50B7DD4581}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PokeFoundations.VeekunImport</RootNamespace>
+    <RootNamespace>PkmnFoundations.VeekunImport</RootNamespace>
     <AssemblyName>VeekunImport</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
diff --git a/gts/BoxUploadDecode.aspx.cs b/gts/BoxUploadDecode.aspx.cs
index eec29f87..c8cf3213 100644
--- a/gts/BoxUploadDecode.aspx.cs
+++ b/gts/BoxUploadDecode.aspx.cs
@@ -6,7 +6,7 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.Text;
 
-namespace PokeFoundations.GTS
+namespace PkmnFoundations.GTS
 {
     public partial class BoxUploadDecode : System.Web.UI.Page
     {
diff --git a/gts/BoxUploadDecode.aspx.designer.cs b/gts/BoxUploadDecode.aspx.designer.cs
index 6618171f..5d034347 100644
--- a/gts/BoxUploadDecode.aspx.designer.cs
+++ b/gts/BoxUploadDecode.aspx.designer.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace PokeFoundations.GTS {
+namespace PkmnFoundations.GTS {
     
     
     public partial class BoxUploadDecode {
diff --git a/gts/DatabaseTest.aspx.cs b/gts/DatabaseTest.aspx.cs
index d08513ac..969dc52c 100644
--- a/gts/DatabaseTest.aspx.cs
+++ b/gts/DatabaseTest.aspx.cs
@@ -5,10 +5,10 @@ using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.Text;
-using PokeFoundations.Structures;
-using PokeFoundations.Data;
+using PkmnFoundations.Structures;
+using PkmnFoundations.Data;
 
-namespace PokeFoundations.GTS
+namespace PkmnFoundations.GTS
 {
     public partial class DatabaseTest : System.Web.UI.Page
     {
diff --git a/gts/DatabaseTest.aspx.designer.cs b/gts/DatabaseTest.aspx.designer.cs
index f2e3bcf8..c89c84ee 100644
--- a/gts/DatabaseTest.aspx.designer.cs
+++ b/gts/DatabaseTest.aspx.designer.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace PokeFoundations.GTS {
+namespace PkmnFoundations.GTS {
     
     
     public partial class DatabaseTest {
diff --git a/gts/Default.aspx b/gts/Default.aspx
index 77cae1a8..0bb45165 100644
--- a/gts/Default.aspx
+++ b/gts/Default.aspx
@@ -1,4 +1,4 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="gts.Default" %>
+<%@ Page Title="" Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="PkmnFoundations.GTS.Default" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="cpHead" runat="server">
 </asp:Content>
diff --git a/gts/Default.aspx.cs b/gts/Default.aspx.cs
index 4782bfa0..ceba856a 100644
--- a/gts/Default.aspx.cs
+++ b/gts/Default.aspx.cs
@@ -4,10 +4,10 @@ using System.Linq;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
-using PokeFoundations.GTS;
+using PkmnFoundations.GTS;
 using System.Text;
 
-namespace gts
+namespace PkmnFoundations.GTS
 {
     public partial class Default : System.Web.UI.Page
     {
diff --git a/gts/Default.aspx.designer.cs b/gts/Default.aspx.designer.cs
index c1237d23..d7428804 100644
--- a/gts/Default.aspx.designer.cs
+++ b/gts/Default.aspx.designer.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace gts {
+namespace PkmnFoundations.GTS {
     
     
     public partial class Default {
diff --git a/gts/Global.asax.cs b/gts/Global.asax.cs
index b51fcd4d..c20d813e 100644
--- a/gts/Global.asax.cs
+++ b/gts/Global.asax.cs
@@ -4,9 +4,9 @@ using System.Linq;
 using System.Web;
 using System.Web.Security;
 using System.Web.SessionState;
-using PokeFoundations.GTS;
+using PkmnFoundations.GTS;
 
-namespace gts
+namespace PkmnFoundations.GTS
 {
     public class Global : System.Web.HttpApplication
     {
diff --git a/gts/MasterPage.master b/gts/MasterPage.master
index 3f92a974..40d1a034 100644
--- a/gts/MasterPage.master
+++ b/gts/MasterPage.master
@@ -1,4 +1,4 @@
-<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="MasterPage.master.cs" Inherits="gts.MasterPage" %>
+<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="MasterPage.master.cs" Inherits="PkmnFoundations.GTS.MasterPage" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
diff --git a/gts/MasterPage.master.cs b/gts/MasterPage.master.cs
index febf5547..938d0b87 100644
--- a/gts/MasterPage.master.cs
+++ b/gts/MasterPage.master.cs
@@ -5,7 +5,7 @@ using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 
-namespace gts
+namespace PkmnFoundations.GTS
 {
     public partial class MasterPage : System.Web.UI.MasterPage
     {
diff --git a/gts/MasterPage.master.designer.cs b/gts/MasterPage.master.designer.cs
index 96f44324..bbb2ee93 100644
--- a/gts/MasterPage.master.designer.cs
+++ b/gts/MasterPage.master.designer.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace gts {
+namespace PkmnFoundations.GTS {
     
     
     public partial class MasterPage {
diff --git a/gts/gts.csproj b/gts/gts.csproj
index e69cc685..9eea8082 100644
--- a/gts/gts.csproj
+++ b/gts/gts.csproj
@@ -10,8 +10,8 @@
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PokeFoundations.GTS</RootNamespace>
-    <AssemblyName>gts</AssemblyName>
+    <RootNamespace>PkmnFoundations.GTS</RootNamespace>
+    <AssemblyName>PkmnFoundations.GTS</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <UseIISExpress>false</UseIISExpress>
   </PropertyGroup>
diff --git a/gts/pokemondpds.ashx.cs b/gts/pokemondpds.ashx.cs
index 3b218980..18413250 100644
--- a/gts/pokemondpds.ashx.cs
+++ b/gts/pokemondpds.ashx.cs
@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using System.Web.SessionState;
-using PokeFoundations.Data;
-using PokeFoundations.Structures;
-using PokeFoundations.Support;
+using PkmnFoundations.Data;
+using PkmnFoundations.Structures;
+using PkmnFoundations.Support;
 
-namespace PokeFoundations.GTS
+namespace PkmnFoundations.GTS
 {
     /// <summary>
     /// Summary description for pokemondpds
diff --git a/gts/src/Common.cs b/gts/src/Common.cs
index 28a6687c..d1a45caf 100644
--- a/gts/src/Common.cs
+++ b/gts/src/Common.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 
-namespace PokeFoundations.GTS
+namespace PkmnFoundations.GTS
 {
     public static class Common
     {
diff --git a/gts/src/GtsContextExtender.cs b/gts/src/GtsContextExtender.cs
index eedcebaf..0a5026eb 100644
--- a/gts/src/GtsContextExtender.cs
+++ b/gts/src/GtsContextExtender.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 
-namespace PokeFoundations.GTS
+namespace PkmnFoundations.GTS
 {
     public static class GtsContextExtender
     {
diff --git a/gts/src/GtsSession4.cs b/gts/src/GtsSession4.cs
index f00642ea..6e0bcf6d 100644
--- a/gts/src/GtsSession4.cs
+++ b/gts/src/GtsSession4.cs
@@ -6,7 +6,7 @@ using System.Security.Cryptography;
 using System.IO;
 using System.Net;
 
-namespace PokeFoundations.GTS
+namespace PkmnFoundations.GTS
 {
     public class GtsSession4 : GtsSessionBase
     {
diff --git a/gts/src/GtsSessionBase.cs b/gts/src/GtsSessionBase.cs
index 891e592f..f5284064 100644
--- a/gts/src/GtsSessionBase.cs
+++ b/gts/src/GtsSessionBase.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Web;
 using System.Security.Cryptography;
 
-namespace PokeFoundations.GTS
+namespace PkmnFoundations.GTS
 {
     public class GtsSessionBase
     {
diff --git a/library/Data/DataAbstract.cs b/library/Data/DataAbstract.cs
index 272124f2..2580e373 100644
--- a/library/Data/DataAbstract.cs
+++ b/library/Data/DataAbstract.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Data;
-using PokeFoundations.Structures;
+using PkmnFoundations.Structures;
 
-namespace PokeFoundations.Data
+namespace PkmnFoundations.Data
 {
     public abstract class DataAbstract
     {
diff --git a/library/Data/DataMysql.cs b/library/Data/DataMysql.cs
index 4b4d60c7..b48fbc0c 100644
--- a/library/Data/DataMysql.cs
+++ b/library/Data/DataMysql.cs
@@ -4,10 +4,10 @@ using System.Linq;
 using System.Text;
 using System.Data;
 using MySql.Data.MySqlClient;
-using PokeFoundations.Structures;
-using PokeFoundations.Support;
+using PkmnFoundations.Structures;
+using PkmnFoundations.Support;
 
-namespace PokeFoundations.Data
+namespace PkmnFoundations.Data
 {
     public class DataMysql : DataAbstract
     {
diff --git a/library/Data/DataSqlite.cs b/library/Data/DataSqlite.cs
index 664c9c9a..a9b2e21c 100644
--- a/library/Data/DataSqlite.cs
+++ b/library/Data/DataSqlite.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Data;
 using System.Data.SQLite;
 
-namespace PokeFoundations.Data
+namespace PkmnFoundations.Data
 {
     public class DataSqlite// : DataAbstract
     {
diff --git a/library/Data/DatabaseExtender.cs b/library/Data/DatabaseExtender.cs
index 6e2732c5..64604bdb 100644
--- a/library/Data/DatabaseExtender.cs
+++ b/library/Data/DatabaseExtender.cs
@@ -7,7 +7,7 @@ using System.Data.Common;
 using System.Data.SqlClient;
 using MySql.Data.MySqlClient;
 
-namespace PokeFoundations.Data
+namespace PkmnFoundations.Data
 {
     /// <summary>
     /// Provides extension and convenience methods for working with ADO.NET databases.
diff --git a/library/Library.csproj b/library/Library.csproj
index 0a5e73bd..d5fe477a 100644
--- a/library/Library.csproj
+++ b/library/Library.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{408EFC7E-C6B0-4160-8628-2679E34385CE}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PokeFoundations</RootNamespace>
-    <AssemblyName>Library</AssemblyName>
+    <RootNamespace>PkmnFoundations</RootNamespace>
+    <AssemblyName>PkmnFoundations.Library</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
diff --git a/library/Structures/Enums.cs b/library/Structures/Enums.cs
index 1beaedf6..9e7e7e62 100644
--- a/library/Structures/Enums.cs
+++ b/library/Structures/Enums.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace PokeFoundations.Structures
+namespace PkmnFoundations.Structures
 {
     public enum Generations
     {
diff --git a/library/Structures/GtsRecord4.cs b/library/Structures/GtsRecord4.cs
index eb8b8f38..734f4967 100644
--- a/library/Structures/GtsRecord4.cs
+++ b/library/Structures/GtsRecord4.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Runtime.Serialization;
 using System.IO;
 
-namespace PokeFoundations.Structures
+namespace PkmnFoundations.Structures
 {
     /// <summary>
     /// Structure used to represent Pokémon on the GTS in Generation IV.
diff --git a/library/Support/AssertHelper.cs b/library/Support/AssertHelper.cs
index 4da3a397..2de67041 100644
--- a/library/Support/AssertHelper.cs
+++ b/library/Support/AssertHelper.cs
@@ -4,7 +4,7 @@ using System.Text;
 using System.Diagnostics;
 using System.IO;
 
-namespace PokeFoundations.Support
+namespace PkmnFoundations.Support
 {
     public class AssertHelper
     {
diff --git a/pokedex/Default.aspx.cs b/pokedex/Default.aspx.cs
index 5c1ecd51..e11b4bcf 100644
--- a/pokedex/Default.aspx.cs
+++ b/pokedex/Default.aspx.cs
@@ -5,7 +5,7 @@ using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 
-namespace PokeFoundations.Pokedex
+namespace PkmnFoundations.Pokedex
 {
     public partial class Default : System.Web.UI.Page
     {
diff --git a/pokedex/Global.asax.cs b/pokedex/Global.asax.cs
index 28279417..0d3f682b 100644
--- a/pokedex/Global.asax.cs
+++ b/pokedex/Global.asax.cs
@@ -5,7 +5,7 @@ using System.Web;
 using System.Web.Security;
 using System.Web.SessionState;
 
-namespace PokeFoundations.Pokedex
+namespace PkmnFoundations.Pokedex
 {
     public class Global : System.Web.HttpApplication
     {
diff --git a/pokedex/Pokedex.csproj b/pokedex/Pokedex.csproj
index 29a56386..662ea1c4 100644
--- a/pokedex/Pokedex.csproj
+++ b/pokedex/Pokedex.csproj
@@ -10,7 +10,7 @@
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PokeFoundations.Pokedex</RootNamespace>
+    <RootNamespace>PkmnFoundations.Pokedex</RootNamespace>
     <AssemblyName>Pokedex</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <TargetFrameworkProfile />