diff --git a/samples/features/master-data-services/metadata2/Metadata.csproj b/samples/features/master-data-services/metadata/Metadata.csproj
similarity index 100%
rename from samples/features/master-data-services/metadata2/Metadata.csproj
rename to samples/features/master-data-services/metadata/Metadata.csproj
diff --git a/samples/features/master-data-services/metadata2/Program.cs b/samples/features/master-data-services/metadata/Program.cs
similarity index 100%
rename from samples/features/master-data-services/metadata2/Program.cs
rename to samples/features/master-data-services/metadata/Program.cs
diff --git a/samples/features/master-data-services/metadata2/Properties/AssemblyInfo.cs b/samples/features/master-data-services/metadata/Properties/AssemblyInfo.cs
similarity index 100%
rename from samples/features/master-data-services/metadata2/Properties/AssemblyInfo.cs
rename to samples/features/master-data-services/metadata/Properties/AssemblyInfo.cs
diff --git a/samples/features/master-data-services/metadata2/README.md b/samples/features/master-data-services/metadata/README.md
similarity index 100%
rename from samples/features/master-data-services/metadata2/README.md
rename to samples/features/master-data-services/metadata/README.md
diff --git a/samples/features/master-data-services/metadata2/Reference.cs b/samples/features/master-data-services/metadata/Reference.cs
similarity index 100%
rename from samples/features/master-data-services/metadata2/Reference.cs
rename to samples/features/master-data-services/metadata/Reference.cs
diff --git a/samples/features/master-data-services/security2/Program.cs b/samples/features/master-data-services/security/Program.cs
similarity index 100%
rename from samples/features/master-data-services/security2/Program.cs
rename to samples/features/master-data-services/security/Program.cs
diff --git a/samples/features/master-data-services/security2/Properties/AssemblyInfo.cs b/samples/features/master-data-services/security/Properties/AssemblyInfo.cs
similarity index 100%
rename from samples/features/master-data-services/security2/Properties/AssemblyInfo.cs
rename to samples/features/master-data-services/security/Properties/AssemblyInfo.cs
diff --git a/samples/features/master-data-services/security2/README.md b/samples/features/master-data-services/security/README.md
similarity index 100%
rename from samples/features/master-data-services/security2/README.md
rename to samples/features/master-data-services/security/README.md
diff --git a/samples/features/master-data-services/security2/Reference.cs b/samples/features/master-data-services/security/Reference.cs
similarity index 100%
rename from samples/features/master-data-services/security2/Reference.cs
rename to samples/features/master-data-services/security/Reference.cs
diff --git a/samples/features/master-data-services/security2/Security.csproj b/samples/features/master-data-services/security/Security.csproj
similarity index 100%
rename from samples/features/master-data-services/security2/Security.csproj
rename to samples/features/master-data-services/security/Security.csproj
diff --git a/samples/features/master-data-services/security2/SecurityInformation.cs b/samples/features/master-data-services/security/SecurityInformation.cs
similarity index 100%
rename from samples/features/master-data-services/security2/SecurityInformation.cs
rename to samples/features/master-data-services/security/SecurityInformation.cs
diff --git a/samples/features/master-data-services/workflow2/Microsoft.MasterDataServices.SharePointWorkflow.csproj b/samples/features/master-data-services/workflow/Microsoft.MasterDataServices.SharePointWorkflow.csproj
similarity index 100%
rename from samples/features/master-data-services/workflow2/Microsoft.MasterDataServices.SharePointWorkflow.csproj
rename to samples/features/master-data-services/workflow/Microsoft.MasterDataServices.SharePointWorkflow.csproj
diff --git a/samples/features/master-data-services/workflow2/Properties/AssemblyInfo.cs b/samples/features/master-data-services/workflow/Properties/AssemblyInfo.cs
similarity index 100%
rename from samples/features/master-data-services/workflow2/Properties/AssemblyInfo.cs
rename to samples/features/master-data-services/workflow/Properties/AssemblyInfo.cs
diff --git a/samples/features/master-data-services/workflow2/README.md b/samples/features/master-data-services/workflow/README.md
similarity index 100%
rename from samples/features/master-data-services/workflow2/README.md
rename to samples/features/master-data-services/workflow/README.md
diff --git a/samples/features/master-data-services/workflow2/SharePointWorkflowExtender.cs b/samples/features/master-data-services/workflow/SharePointWorkflowExtender.cs
similarity index 100%
rename from samples/features/master-data-services/workflow2/SharePointWorkflowExtender.cs
rename to samples/features/master-data-services/workflow/SharePointWorkflowExtender.cs