diff --git a/Upsilon/BaseTypes/TypeContainer.cs b/Upsilon/BaseTypes/TypeContainer.cs
index 88c4288..c2a1fb9 100644
--- a/Upsilon/BaseTypes/TypeContainer.cs
+++ b/Upsilon/BaseTypes/TypeContainer.cs
@@ -68,7 +68,7 @@ namespace Upsilon.BaseTypes
 
         public override string ToString()
         {
-            return Type.ToString();
+            return Type == Type.UserData ? UserData : Type.ToString();
         }
     }
 
diff --git a/Upsilon/Binder/VariableSymbols/UserDataVariableSymbol.cs b/Upsilon/Binder/VariableSymbols/UserDataVariableSymbol.cs
index f457ae4..74cfa09 100644
--- a/Upsilon/Binder/VariableSymbols/UserDataVariableSymbol.cs
+++ b/Upsilon/Binder/VariableSymbols/UserDataVariableSymbol.cs
@@ -8,7 +8,7 @@ namespace Upsilon.Binder.VariableSymbols
         public BoundTypeDefinition BoundTypeDefinition { get; }
         public UserDataBoundTypeDefinition Parent { get; }
 
-        public UserDataVariableSymbol(string name, Type typeContainer, bool isLocal) : base(name, typeContainer, isLocal)
+        public UserDataVariableSymbol(string name, TypeContainer typeContainer, bool isLocal) : base(name, typeContainer, isLocal)
         {
             _typeContainer = typeContainer;
         }