diff --git a/src/TgSharp.TL/ObjectDeserializer.cs b/src/TgSharp.TL/ObjectDeserializer.cs
index 524f72a..08d7b2b 100644
--- a/src/TgSharp.TL/ObjectDeserializer.cs
+++ b/src/TgSharp.TL/ObjectDeserializer.cs
@@ -5,8 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-using TeleSharp.TL;
-namespace TeleSharp.TL
+namespace TgSharp.TL
 {
     public class ObjectUtils
     {
diff --git a/src/TgSharp.TL/TLContext.cs b/src/TgSharp.TL/TLContext.cs
index be43936..2d04707 100644
--- a/src/TgSharp.TL/TLContext.cs
+++ b/src/TgSharp.TL/TLContext.cs
@@ -5,8 +5,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
-using TeleSharp.TL;
-namespace TeleSharp.TL
+namespace TgSharp.TL
 {
     public static class TLContext
     {
@@ -16,7 +15,7 @@ namespace TeleSharp.TL
         {
             Types = new Dictionary<int, Type>();
             Types = (from t in Assembly.GetExecutingAssembly().GetTypes()
-                     where t.IsClass && t.Namespace.StartsWith("TeleSharp.TL")
+                     where t.IsClass && t.Namespace.StartsWith(typeof(TLContext).Namespace)
                      where t.IsSubclassOf(typeof(TLObject))
                      where t.GetCustomAttribute(typeof(TLObjectAttribute)) != null
                      select t).ToDictionary(x => ((TLObjectAttribute)x.GetCustomAttribute(typeof(TLObjectAttribute))).Constructor, x => x);
diff --git a/src/TgSharp.TL/TLMethod.cs b/src/TgSharp.TL/TLMethod.cs
index 25b8d99..b7a75ae 100644
--- a/src/TgSharp.TL/TLMethod.cs
+++ b/src/TgSharp.TL/TLMethod.cs
@@ -5,8 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-using TeleSharp.TL;
-namespace TeleSharp.TL
+namespace TgSharp.TL
 {
     public abstract class TLMethod : TLObject
     {
diff --git a/src/TgSharp.TL/TLObject.cs b/src/TgSharp.TL/TLObject.cs
index f398ddf..27b478e 100644
--- a/src/TgSharp.TL/TLObject.cs
+++ b/src/TgSharp.TL/TLObject.cs
@@ -5,8 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-using TeleSharp.TL;
-namespace TeleSharp.TL
+namespace TgSharp.TL
 {
     public class TLObjectAttribute : Attribute
     {
diff --git a/src/TgSharp.TL/TLUtils.cs b/src/TgSharp.TL/TLUtils.cs
index 1f8c80c..e4501fa 100644
--- a/src/TgSharp.TL/TLUtils.cs
+++ b/src/TgSharp.TL/TLUtils.cs
@@ -6,8 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-using TeleSharp.TL;
-namespace TeleSharp.TL
+namespace TgSharp.TL
 {
     public class IntegerUtil
     {
diff --git a/src/TgSharp.TL/TLVector.cs b/src/TgSharp.TL/TLVector.cs
index 29f82e7..f0dc084 100644
--- a/src/TgSharp.TL/TLVector.cs
+++ b/src/TgSharp.TL/TLVector.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace TeleSharp.TL
+namespace TgSharp.TL
 {
     public class TLVector<T> : TLObject, IList<T>
     {