diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Commands/ImportExportCommands.cs b/src/Orchard.Web/Modules/Orchard.ImportExport/Commands/ImportExportCommands.cs
index 2e338f471..eb747250d 100644
--- a/src/Orchard.Web/Modules/Orchard.ImportExport/Commands/ImportExportCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Commands/ImportExportCommands.cs
@@ -100,7 +100,7 @@ namespace Orchard.ImportExport.Commands {
             var recipeBuilderSteps = new List<IRecipeBuilderStep>();
 
             if (Metadata || Data) {
-                var dataStep = _orchardServices.WorkContext.Resolve<DataRecipeBuilderStep>();
+                var dataStep = _orchardServices.WorkContext.Resolve<ContentRecipeBuilderStep>();
 
                 if(Data)
                     dataStep.DataContentTypes = exportTypes;
diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/Export.cshtml b/src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/Export.cshtml
index 5c9f69946..4c5e7513b 100644
--- a/src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/Export.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/Export.cshtml
@@ -8,7 +8,7 @@
         var stepName = Html.NameFor(m => m.ExportSteps[exportStepIndex].IsSelected).ToString();
         var stepId = stepName.HtmlClassify();
 
-        <fieldset class="export-step export-step-@exportStep.Name.HtmlClassify()">
+        <fieldset class="recipe-builder-step recipe-builder-step-@exportStep.Name.HtmlClassify()">
             <legend>
                 <input type="hidden" name="@Html.NameFor(m => m.ExportSteps[exportStepIndex].Name)" value="@Model.ExportSteps[exportStepIndex].Name"/>
                 <input type="checkbox" id="@stepId" name="@stepName" value="true"/>
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj b/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj
index 30fcadb25..a33c16a5b 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj
@@ -69,8 +69,8 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Module.txt" />
-    <Content Include="Scripts\exportstep-data.js" />
-    <Content Include="Styles\exportstep-data.css" />
+    <Content Include="Scripts\recipebuilderstep-data.js" />
+    <Content Include="Styles\recipebuilderstep-content.css" />
     <Content Include="Styles\images\menu.importexport.png" />
     <Content Include="Styles\menu.importexport-admin.css" />
     <Content Include="Web.config" />
@@ -82,7 +82,7 @@
     <Compile Include="Models\RecipeStepResultRecord.cs" />
     <Compile Include="Models\VersionHistoryOptions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RecipeBuilders\DataRecipeBuilderStep.cs" />
+    <Compile Include="RecipeBuilders\ContentRecipeBuilderStep.cs" />
     <Compile Include="RecipeBuilders\RecipeMetadataBuilderStep.cs" />
     <Compile Include="RecipeBuilders\SiteSettingsBuilderStep.cs" />
     <Compile Include="RecipeHandlers\CommandRecipeHandler.cs" />
@@ -146,7 +146,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\EditorTemplates\ExportSteps\Data.cshtml" />
+    <Content Include="Views\EditorTemplates\ExportSteps\Content.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\EditorTemplates\ExportSteps\RecipeMetadata.cshtml" />
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/DataRecipeBuilderStep.cs b/src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/ContentRecipeBuilderStep.cs
similarity index 96%
rename from src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/DataRecipeBuilderStep.cs
rename to src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/ContentRecipeBuilderStep.cs
index caa0b2846..d2491ef73 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/DataRecipeBuilderStep.cs
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/ContentRecipeBuilderStep.cs
@@ -10,12 +10,12 @@ using Orchard.Recipes.Services;
 using Orchard.Recipes.ViewModels;
 
 namespace Orchard.Recipes.RecipeBuilders {
-    public class DataRecipeBuilderStep : RecipeBuilderStep {
+    public class ContentRecipeBuilderStep : RecipeBuilderStep {
         private readonly IContentDefinitionManager _contentDefinitionManager;
         private readonly IOrchardServices _orchardServices;
         private readonly IContentDefinitionWriter _contentDefinitionWriter;
 
-        public DataRecipeBuilderStep(
+        public ContentRecipeBuilderStep(
             IContentDefinitionManager contentDefinitionManager, 
             IOrchardServices orchardServices, 
             IContentDefinitionWriter contentDefinitionWriter) {
@@ -26,11 +26,11 @@ namespace Orchard.Recipes.RecipeBuilders {
         }
 
         public override string Name {
-            get { return "Data"; }
+            get { return "Content"; }
         }
 
         public override LocalizedString DisplayName {
-            get { return T("Content Items and Definitions"); }
+            get { return T("Content and Content Definitions"); }
         }
 
         public override LocalizedString Description {
@@ -64,7 +64,7 @@ namespace Orchard.Recipes.RecipeBuilders {
                 VersionHistoryOptions = viewModel.VersionHistoryOptions;
             }
 
-            return shapeFactory.EditorTemplate(TemplateName: "ExportSteps/Data", Model: viewModel, Prefix: Prefix);
+            return shapeFactory.EditorTemplate(TemplateName: "ExportSteps/Content", Model: viewModel, Prefix: Prefix);
         }
 
         public override void Build(BuildContext context) {
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Scripts/exportstep-data.js b/src/Orchard.Web/Modules/Orchard.Recipes/Scripts/recipebuilderstep-data.js
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Recipes/Scripts/exportstep-data.js
rename to src/Orchard.Web/Modules/Orchard.Recipes/Scripts/recipebuilderstep-data.js
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Styles/exportstep-data.css b/src/Orchard.Web/Modules/Orchard.Recipes/Styles/exportstep-data.css
deleted file mode 100644
index 7f1aeb3c6..000000000
--- a/src/Orchard.Web/Modules/Orchard.Recipes/Styles/exportstep-data.css
+++ /dev/null
@@ -1,9 +0,0 @@
-fieldset.export-step-data table.items {
-    width: 500px;
-    margin: 0;
-}
-
-fieldset.export-step-data table.items td,
-fieldset.export-step-data table.items thead tr.sub th {
-    padding: 0 12px;
-}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Styles/recipebuilderstep-content.css b/src/Orchard.Web/Modules/Orchard.Recipes/Styles/recipebuilderstep-content.css
new file mode 100644
index 000000000..6af09b5d1
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Styles/recipebuilderstep-content.css
@@ -0,0 +1,9 @@
+fieldset.recipe-builder-step-content table.items {
+    width: 500px;
+    margin: 0;
+}
+
+fieldset.recipe-builder-step-content table.items td,
+fieldset.recipe-builder-step-content table.items thead tr.sub th {
+    padding: 0 12px;
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Views/EditorTemplates/ExportSteps/Data.cshtml b/src/Orchard.Web/Modules/Orchard.Recipes/Views/EditorTemplates/ExportSteps/Content.cshtml
similarity index 96%
rename from src/Orchard.Web/Modules/Orchard.Recipes/Views/EditorTemplates/ExportSteps/Data.cshtml
rename to src/Orchard.Web/Modules/Orchard.Recipes/Views/EditorTemplates/ExportSteps/Content.cshtml
index 776477c37..d13465f9d 100644
--- a/src/Orchard.Web/Modules/Orchard.Recipes/Views/EditorTemplates/ExportSteps/Data.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Views/EditorTemplates/ExportSteps/Content.cshtml
@@ -1,8 +1,8 @@
 @model Orchard.Recipes.ViewModels.DataExportStepViewModel
 @{
-    Style.Include("exportstep-data.css");
+    Style.Include("recipebuilderstep-content.css");
     Script.Require("jQuery");
-    Script.Include("exportstep-data.js");
+    Script.Include("recipebuilderstep-data.js");
 }
 <div>
     <table class="items">