diff --git a/iTraceVS/Properties/AssemblyInfo.cs b/iTraceVS/Properties/AssemblyInfo.cs
index 1153d5e..c22b5a1 100644
--- a/iTraceVS/Properties/AssemblyInfo.cs
+++ b/iTraceVS/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("iTraceVS Plugin")]
+[assembly: AssemblyTitle("iTrace VS Plugin")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("iTraceVS Plugin")]
+[assembly: AssemblyProduct("iTrace VS Plugin")]
 [assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/iTraceVS/iTraceVS.csproj b/iTraceVS/iTraceVS.csproj
index cdfa51d..9eba0a4 100644
--- a/iTraceVS/iTraceVS.csproj
+++ b/iTraceVS/iTraceVS.csproj
@@ -43,7 +43,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>iTraceVS</RootNamespace>
-    <AssemblyName>iTraceVS Plugin</AssemblyName>
+    <AssemblyName>iTrace VS Plugin</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
diff --git a/iTraceVS/itrace_window.cs b/iTraceVS/itrace_window.cs
index 9c88ae4..2faf192 100644
--- a/iTraceVS/itrace_window.cs
+++ b/iTraceVS/itrace_window.cs
@@ -23,7 +23,7 @@ public class itrace_window : ToolWindowPane
         /// </summary>
         public itrace_window() : base(null)
         {
-            this.Caption = "iTraceVS Plugin";
+            this.Caption = "iTrace VS Plugin";
 
             // This is the user control hosted by the tool window; Note that, even if this class implements IDisposable,
             // we are not calling Dispose on this object. This is because ToolWindowPane calls Dispose on
diff --git a/iTraceVS/itrace_windowControl.xaml b/iTraceVS/itrace_windowControl.xaml
index 3195f10..935ba29 100644
--- a/iTraceVS/itrace_windowControl.xaml
+++ b/iTraceVS/itrace_windowControl.xaml
@@ -10,7 +10,7 @@
              Name="MyToolWindow">
     <Grid MaxWidth="300">
         <StackPanel Orientation="Vertical" HorizontalAlignment="Left">
-            <TextBlock HorizontalAlignment="Left" Height="45" Width="209" FontSize="30" Margin="10,5,10,5" Text="iTraceVS Plugin"/>
+            <TextBlock HorizontalAlignment="Left" Height="45" Width="209" FontSize="30" Margin="10,5,10,5" Text="iTrace VS Plugin"/>
             <Button HorizontalAlignment="Left" Content="Connect to Core" Click="attemptConnection" Height="45" Width="120" x:Name="button1" Margin="10,5,5,5"/>
             <!--<CheckBox HorizontalAlignment="Left" Content="Highlight Tokens" Checked="Highlight_Checked" Unchecked="Highlight_Unchecked" Name="highlightBox" Height="20" FontSize="15" Width="145" Margin="10,5,5,5"/>-->
         </StackPanel>
diff --git a/iTraceVS/itrace_windowPackage.cs b/iTraceVS/itrace_windowPackage.cs
index de86336..fe520e9 100644
--- a/iTraceVS/itrace_windowPackage.cs
+++ b/iTraceVS/itrace_windowPackage.cs
@@ -10,9 +10,9 @@ namespace iTraceVS
     public class OptionPageGrid : DialogPage {
         public static int portNum = 8008;
 
-        [Category("iTraceVS Plugin Settings")]
-        [DisplayName("iTraceVS Plugin Port Number")]
-        [Description("Designate which localhost port the iTraceVS Plugin should use.")]
+        [Category("iTrace VS Plugin Settings")]
+        [DisplayName("iTrace VS Plugin Port Number")]
+        [Description("Designate which localhost port the iTrace VS Plugin should use.")]
         public int portNumber {
             get { return portNum; }
             set { portNum = value; }
@@ -40,7 +40,7 @@ public int portNumber {
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [ProvideToolWindow(typeof(itrace_window))]
     [Guid(itrace_windowPackage.PackageGuidString)]
-    [ProvideOptionPage(typeof(OptionPageGrid), "iTraceVS Plugin", "iTraceVS Plugin Settings", 0, 0, true)]
+    [ProvideOptionPage(typeof(OptionPageGrid), "iTrace VS Plugin", "iTrace VS Plugin Settings", 0, 0, true)]
     [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "pkgdef, VS and vsixmanifest are valid VS terms")]
     public sealed class itrace_windowPackage : Package
     {
diff --git a/iTraceVS/itrace_windowPackage.vsct b/iTraceVS/itrace_windowPackage.vsct
index 029d479..98e8bb3 100644
--- a/iTraceVS/itrace_windowPackage.vsct
+++ b/iTraceVS/itrace_windowPackage.vsct
@@ -46,7 +46,7 @@
         <Parent guid="guidSHLMainMenu" id="IDG_VS_WNDO_OTRWNDWS1"/>
         <Icon guid="guidImages" id="logoIcon" />
         <Strings>
-          <ButtonText>iTraceVS Plugin</ButtonText>
+          <ButtonText>iTrace VS Plugin</ButtonText>
         </Strings>
       </Button>
     </Buttons>
diff --git a/iTraceVS/source.extension.vsixmanifest b/iTraceVS/source.extension.vsixmanifest
index e1ad925..79ae237 100644
--- a/iTraceVS/source.extension.vsixmanifest
+++ b/iTraceVS/source.extension.vsixmanifest
@@ -2,7 +2,7 @@
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
     <Identity Id="iTraceVS.ccbd6a77-f3a9-494c-a410-0bbc37e10dd6" Version="0.1.0" Language="en-US" Publisher="iTrace" />
-    <DisplayName>iTraceVS Plugin</DisplayName>
+    <DisplayName>iTrace VS Plugin</DisplayName>
     <Description>iTrace Visual Studio Plugin</Description>
   </Metadata>
   <Installation>