diff --git a/ActivityClean Architecture/globals.xml.ftl b/ActivityCleanArchitecture/globals.xml.ftl
similarity index 100%
rename from ActivityClean Architecture/globals.xml.ftl
rename to ActivityCleanArchitecture/globals.xml.ftl
diff --git a/ActivityClean Architecture/recipe.xml.ftl b/ActivityCleanArchitecture/recipe.xml.ftl
similarity index 100%
rename from ActivityClean Architecture/recipe.xml.ftl
rename to ActivityCleanArchitecture/recipe.xml.ftl
diff --git a/ActivityClean Architecture/root/recipe_manifest.xml.ftl b/ActivityCleanArchitecture/root/recipe_manifest.xml.ftl
similarity index 60%
rename from ActivityClean Architecture/root/recipe_manifest.xml.ftl
rename to ActivityCleanArchitecture/root/recipe_manifest.xml.ftl
index ba1c51f..ef6f051 100644
--- a/ActivityClean Architecture/root/recipe_manifest.xml.ftl	
+++ b/ActivityCleanArchitecture/root/recipe_manifest.xml.ftl
@@ -1,8 +1,8 @@
-<recipe folder="root://activities/common">
+<recipe folder="root://activities/ActivityCleanArchitecture">
 
     <merge from="root/src/AndroidManifest.xml.ftl"
              to="${escapeXmlAttribute(manifestOut)}/AndroidManifest.xml" />
-    <merge from="../../common/root/res/values/manifest_strings.xml.ftl"
+    <merge from="root/res/values/manifest_strings.xml.ftl"
              to="${escapeXmlAttribute(resOut)}/values/strings.xml" />
 
 </recipe>
\ No newline at end of file
diff --git a/ActivityCleanArchitecture/root/res/values/manifest_strings.xml.ftl b/ActivityCleanArchitecture/root/res/values/manifest_strings.xml.ftl
new file mode 100644
index 0000000..5799481
--- /dev/null
+++ b/ActivityCleanArchitecture/root/res/values/manifest_strings.xml.ftl
@@ -0,0 +1,5 @@
+<resources>
+<#if !isNewProject && generateActivityTitle!true>
+    <string name="title_${activityToLayout(activityClass)}">${escapeXmlString(activityTitle)}</string>
+</#if>
+</resources>
diff --git a/ActivityClean Architecture/root/src/AndroidManifest.xml.ftl b/ActivityCleanArchitecture/root/src/AndroidManifest.xml.ftl
similarity index 100%
rename from ActivityClean Architecture/root/src/AndroidManifest.xml.ftl
rename to ActivityCleanArchitecture/root/src/AndroidManifest.xml.ftl
diff --git a/ActivityClean Architecture/root/src/app_package/SimpleActivity.java.ftl b/ActivityCleanArchitecture/root/src/app_package/SimpleActivity.java.ftl
similarity index 100%
rename from ActivityClean Architecture/root/src/app_package/SimpleActivity.java.ftl
rename to ActivityCleanArchitecture/root/src/app_package/SimpleActivity.java.ftl
diff --git a/ActivityClean Architecture/root/src/app_package/SimpleModel.java.ftl b/ActivityCleanArchitecture/root/src/app_package/SimpleModel.java.ftl
similarity index 100%
rename from ActivityClean Architecture/root/src/app_package/SimpleModel.java.ftl
rename to ActivityCleanArchitecture/root/src/app_package/SimpleModel.java.ftl
diff --git a/ActivityClean Architecture/root/src/app_package/SimplePresenter.java.ftl b/ActivityCleanArchitecture/root/src/app_package/SimplePresenter.java.ftl
similarity index 100%
rename from ActivityClean Architecture/root/src/app_package/SimplePresenter.java.ftl
rename to ActivityCleanArchitecture/root/src/app_package/SimplePresenter.java.ftl
diff --git a/ActivityClean Architecture/root/src/app_package/SimpleRepository.java.ftl b/ActivityCleanArchitecture/root/src/app_package/SimpleRepository.java.ftl
similarity index 100%
rename from ActivityClean Architecture/root/src/app_package/SimpleRepository.java.ftl
rename to ActivityCleanArchitecture/root/src/app_package/SimpleRepository.java.ftl
diff --git a/ActivityClean Architecture/root/src/app_package/SimpleRepositoryImpl.java.ftl b/ActivityCleanArchitecture/root/src/app_package/SimpleRepositoryImpl.java.ftl
similarity index 100%
rename from ActivityClean Architecture/root/src/app_package/SimpleRepositoryImpl.java.ftl
rename to ActivityCleanArchitecture/root/src/app_package/SimpleRepositoryImpl.java.ftl
diff --git a/ActivityClean Architecture/root/src/app_package/SimpleRetroiftService.java.ftl b/ActivityCleanArchitecture/root/src/app_package/SimpleRetroiftService.java.ftl
similarity index 100%
rename from ActivityClean Architecture/root/src/app_package/SimpleRetroiftService.java.ftl
rename to ActivityCleanArchitecture/root/src/app_package/SimpleRetroiftService.java.ftl
diff --git a/ActivityClean Architecture/root/src/app_package/SimpleService.java.ftl b/ActivityCleanArchitecture/root/src/app_package/SimpleService.java.ftl
similarity index 100%
rename from ActivityClean Architecture/root/src/app_package/SimpleService.java.ftl
rename to ActivityCleanArchitecture/root/src/app_package/SimpleService.java.ftl
diff --git a/ActivityClean Architecture/root/src/app_package/SimpleView.java.ftl b/ActivityCleanArchitecture/root/src/app_package/SimpleView.java.ftl
similarity index 100%
rename from ActivityClean Architecture/root/src/app_package/SimpleView.java.ftl
rename to ActivityCleanArchitecture/root/src/app_package/SimpleView.java.ftl
diff --git a/ActivityClean Architecture/template.xml b/ActivityCleanArchitecture/template.xml
similarity index 100%
rename from ActivityClean Architecture/template.xml
rename to ActivityCleanArchitecture/template.xml
diff --git a/ActivityClean Architecture/template_blank_activity.png b/ActivityCleanArchitecture/template_blank_activity.png
similarity index 100%
rename from ActivityClean Architecture/template_blank_activity.png
rename to ActivityCleanArchitecture/template_blank_activity.png