diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Empty.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Empty.cshtml
index dda3a17f51..2363dcc14c 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Empty.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Empty.cshtml
@@ -1 +1 @@
-@inherits Umbraco.Web.Macros.PartialViewMacroPage
\ No newline at end of file
+@inherits Umbraco.Web.Mvc.UmbracoTemplatePage
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx b/src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
index b0cc4e634d..b34560a19e 100644
--- a/src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
+++ b/src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
@@ -8,7 +8,7 @@
         <asp:RequiredFieldValidator ID="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="FileName" runat="server">*</asp:RequiredFieldValidator>
     </cc1:PropertyPanel>
 
-    <cc1:PropertyPanel runat="server" Text="Choose a template:">
+    <cc1:PropertyPanel runat="server" Text="Choose a snippet:">
         <asp:ListBox ID="PartialViewTemplate" runat="server" Width="350" CssClass="bigInput input-large-type input-block-level" Rows="1" SelectionMode="Single">
             <asp:ListItem Value="clean.xslt">Clean</asp:ListItem>
         </asp:ListBox>
diff --git a/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx b/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx
index 7a4372d7c9..9dc16377eb 100644
--- a/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx
+++ b/src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx
@@ -9,7 +9,7 @@
         <asp:RequiredFieldValidator ID="RequiredFieldValidator2" ErrorMessage="*" ControlToValidate="FileName" runat="server">*</asp:RequiredFieldValidator>
     </cc1:PropertyPanel>
 
-    <cc1:PropertyPanel runat="server" Text="Choose a template:">
+    <cc1:PropertyPanel runat="server" Text="Choose a snippet:">
         <asp:ListBox ID="PartialViewTemplate" runat="server" CssClass="bigInput input-large-type input-block-level" Rows="1" SelectionMode="Single" />
     </cc1:PropertyPanel>