diff --git a/Client/server/Upsilon.dll b/Client/server/Upsilon.dll
index edfc977..c3d867d 100644
Binary files a/Client/server/Upsilon.dll and b/Client/server/Upsilon.dll differ
diff --git a/Client/server/Upsilon.pdb b/Client/server/Upsilon.pdb
index 942327b..ce5283f 100644
Binary files a/Client/server/Upsilon.pdb and b/Client/server/Upsilon.pdb differ
diff --git a/Client/upsilon-language-extension-1.0.0.vsix b/Client/upsilon-language-extension-1.0.0.vsix
index 202a1ce..d9d73aa 100644
Binary files a/Client/upsilon-language-extension-1.0.0.vsix and b/Client/upsilon-language-extension-1.0.0.vsix differ
diff --git a/UpsilonLanguageServer/Lib/Upsilon.dll b/UpsilonLanguageServer/Lib/Upsilon.dll
index edfc977..d4b4c61 100644
Binary files a/UpsilonLanguageServer/Lib/Upsilon.dll and b/UpsilonLanguageServer/Lib/Upsilon.dll differ
diff --git a/UpsilonLanguageServer/Lib/Upsilon.pdb b/UpsilonLanguageServer/Lib/Upsilon.pdb
index 942327b..50a876d 100644
Binary files a/UpsilonLanguageServer/Lib/Upsilon.pdb and b/UpsilonLanguageServer/Lib/Upsilon.pdb differ
diff --git a/UpsilonLanguageServer/UpsilonLanguageServer.sln.DotSettings.user b/UpsilonLanguageServer/UpsilonLanguageServer.sln.DotSettings.user
index 99e3685..a79c6b3 100644
--- a/UpsilonLanguageServer/UpsilonLanguageServer.sln.DotSettings.user
+++ b/UpsilonLanguageServer/UpsilonLanguageServer.sln.DotSettings.user
@@ -1,3 +1,9 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Int64 x:Key="/Default/CodeStyle/Naming/CSharpAutoNaming/AutoNamingCompletedVersion/@EntryValue">2</s:Int64>
 	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpAutoNaming/IsNamingAutoDetectionCompleted/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpAutoNaming/IsNotificationDisabled/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpAutoNaming/IsNotificationDisabled/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/AutoDetectedNamingRules/=Locals/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/AutoDetectedNamingRules/=Method/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/AutoDetectedNamingRules/=Parameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/AutoDetectedNamingRules/=Property/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/AutoDetectedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/UpsilonLanguageServer/UpsilonLanguageServer/BoundTypeParser.cs b/UpsilonLanguageServer/UpsilonLanguageServer/BoundTypeParser.cs
index 58e1c42..2ad6736 100644
--- a/UpsilonLanguageServer/UpsilonLanguageServer/BoundTypeParser.cs
+++ b/UpsilonLanguageServer/UpsilonLanguageServer/BoundTypeParser.cs
@@ -165,7 +165,8 @@ namespace UpsilonLanguageServer
                         var parsedReturnType = ParseType(returnType);
                         listOptions.Add(new InternalFunctionVariableOption(parsedReturnType, parameters.ToArray(), null));
                     }
-                    StaticScope.BoundScope.AssignToNearest(new InternalFunctionVariableSymbol(name, false, Type.Function, listOptions)
+                    StaticScope.BoundScope.AssignToNearest(
+                        new InternalFunctionVariableSymbol(name, false, listOptions, false)
                     {
                         CommentValue = comments
                     });
diff --git a/UpsilonLanguageServer/UpsilonLanguageServer/Services/TextDocumentServer.cs b/UpsilonLanguageServer/UpsilonLanguageServer/Services/TextDocumentServer.cs
index 249a067..b0c7449 100644
--- a/UpsilonLanguageServer/UpsilonLanguageServer/Services/TextDocumentServer.cs
+++ b/UpsilonLanguageServer/UpsilonLanguageServer/Services/TextDocumentServer.cs
@@ -33,7 +33,7 @@ namespace UpsilonLanguageServer.Services
                         var contents = new StringBuilder($"Kind: {findNode.Kind}");
                         if (findNode is BoundExpression expression)
                         {
-                            contents.Append($"\n\nType: {expression.Type}");
+                            contents.Append($"\n\nType: {expression.ValueType}");
                         }
 
                         if (findNode is BoundVariableSymbol varSymbol)
@@ -50,7 +50,7 @@ namespace UpsilonLanguageServer.Services
                         }
                         else if (findNode is BoundVariableAssignment variableAssignment)
                         {
-                            contents.Append($"\n\nType: {variableAssignment.Variable.Type}");
+                            contents.Append($"\n\nType: {variableAssignment.Variable.ValueType}");
                         }
                         else if (findNode is BoundFunctionExpression fe)
                         {
@@ -59,8 +59,8 @@ namespace UpsilonLanguageServer.Services
                         else if (findNode is BoundFunctionCallExpression functionCall)
                         {
                             contents.Append(
-                                $"\n\nParameters: {string.Join(", ", functionCall.Parameters.Select(x => x.Type))}");
-                            contents.Append($"\n\nReturns: {functionCall.Type}");
+                                $"\n\nParameters: {string.Join(", ", functionCall.Parameters.Select(x => x.ValueType))}");
+                            contents.Append($"\n\nReturns: {functionCall.ValueType}");
                         }
 
                         return new Hover()