diff --git a/Composer/packages/client/src/components/CreationFlow/v2/CreationFlow.tsx b/Composer/packages/client/src/components/CreationFlow/v2/CreationFlow.tsx
index 75ba7f6fce..18b818da7e 100644
--- a/Composer/packages/client/src/components/CreationFlow/v2/CreationFlow.tsx
+++ b/Composer/packages/client/src/components/CreationFlow/v2/CreationFlow.tsx
@@ -148,7 +148,7 @@ const CreationFlowV2: React.FC<CreationFlowProps> = () => {
 
   const handleCreateNext = async (data: string) => {
     setCreationFlowStatus(CreationFlowStatus.NEW_FROM_TEMPLATE);
-    navigate(`./create/${data}`);
+    navigate(`./create/${encodeURIComponent(data)}`);
   };
 
   return (
diff --git a/Composer/packages/server/src/models/asset/assetManager.ts b/Composer/packages/server/src/models/asset/assetManager.ts
index 3dca630004..5595a5ed7b 100644
--- a/Composer/packages/server/src/models/asset/assetManager.ts
+++ b/Composer/packages/server/src/models/asset/assetManager.ts
@@ -281,7 +281,8 @@ export class AssetManager {
   private getPackageDisplayName(packageName: string): string {
     if (packageName) {
       return packageName
-        .replace('generator-', '')
+        .replace(/^@microsoft\/generator-microsoft-bot/, '') // clean up our complex package names
+        .replace(/^generator-/, '') // clean up other package names too
         .split('-')
         .reduce((a, b) => a.charAt(0).toUpperCase() + a.slice(1) + ' ' + b.charAt(0).toUpperCase() + b.slice(1));
     } else {