diff --git a/packages/react-app-scaffolder/generators/app/index.js b/packages/react-app-scaffolder/generators/app/index.js
index 3428109c69..7a7aa8bcb1 100644
--- a/packages/react-app-scaffolder/generators/app/index.js
+++ b/packages/react-app-scaffolder/generators/app/index.js
@@ -238,7 +238,7 @@ module.exports = class extends Generator {
           author,
         })
       } else {
-        this.fs.copyTpl(this.templatePath('_package.base.isFoundation.json'), this.destinationPath('./package.json'), {
+        this.fs.copyTpl(this.templatePath('_package.base.is-foundation.json'), this.destinationPath('./package.json'), {
           name,
           repo,
           description,
diff --git a/packages/react-app-scaffolder/generators/app/templates/_package.base.isFoundation.json b/packages/react-app-scaffolder/generators/app/templates/_package.base.is-foundation.json
similarity index 100%
rename from packages/react-app-scaffolder/generators/app/templates/_package.base.isFoundation.json
rename to packages/react-app-scaffolder/generators/app/templates/_package.base.is-foundation.json
diff --git a/packages/react-app-scaffolder/generators/app/templates/apollo/src/components/pages/authenticated.tsx b/packages/react-app-scaffolder/generators/app/templates/apollo/src/components/pages/authenticated.tsx
index f8fd1a8183..d46ac3db14 100644
--- a/packages/react-app-scaffolder/generators/app/templates/apollo/src/components/pages/authenticated.tsx
+++ b/packages/react-app-scaffolder/generators/app/templates/apollo/src/components/pages/authenticated.tsx
@@ -11,7 +11,7 @@ export const Authenticated: React.FunctionComponent<AuthenticatedProps> = () =>
   return (
     <FlexContainerBasic hasPadding>
       <FlexContainerResponsive flexColumn hasPadding hasBackground>
-        <H3>Welcome To Reapit Elements</H3>
+        <H3>Welcome To Reapit Foundations</H3>
         <SubTitleH5>You are now authenticated against our sandbox data</SubTitleH5>
       </FlexContainerResponsive>
     </FlexContainerBasic>
diff --git a/packages/react-app-scaffolder/generators/app/templates/apollo/src/components/pages/home.tsx b/packages/react-app-scaffolder/generators/app/templates/apollo/src/components/pages/home.tsx
index a7bc2a0b77..6dd617ae62 100644
--- a/packages/react-app-scaffolder/generators/app/templates/apollo/src/components/pages/home.tsx
+++ b/packages/react-app-scaffolder/generators/app/templates/apollo/src/components/pages/home.tsx
@@ -15,7 +15,7 @@ export const Home: React.FunctionComponent<HomeProps> = () => {
   return (
     <FlexContainerBasic hasPadding hasBackground>
       <FlexContainerResponsive flexColumn hasPadding hasBackground>
-        <H3>Welcome To Reapit Elements</H3>
+        <H3>Welcome To Reapit Foundations</H3>
         <SubTitleH5>
           Click <Link to="/login">here</Link> to login
         </SubTitleH5>
diff --git a/packages/react-app-scaffolder/generators/app/templates/no-redux/src/components/pages/authenticated.tsx b/packages/react-app-scaffolder/generators/app/templates/no-redux/src/components/pages/authenticated.tsx
index f26a146ba9..827a6e819d 100644
--- a/packages/react-app-scaffolder/generators/app/templates/no-redux/src/components/pages/authenticated.tsx
+++ b/packages/react-app-scaffolder/generators/app/templates/no-redux/src/components/pages/authenticated.tsx
@@ -13,7 +13,7 @@ export const Authenticated: React.FunctionComponent<AuthenticatedProps> = () =>
     <ErrorBoundary>
       <FlexContainerBasic hasPadding>
         <FlexContainerResponsive flexColumn hasPadding hasBackground>
-          <H3>Welcome To Reapit Elements</H3>
+          <H3>Welcome To Reapit Foundations</H3>
           <SubTitleH5>You are now authenticated against our sandbox data</SubTitleH5>
         </FlexContainerResponsive>
       </FlexContainerBasic>
diff --git a/packages/react-app-scaffolder/generators/app/templates/no-redux/src/components/pages/home.tsx b/packages/react-app-scaffolder/generators/app/templates/no-redux/src/components/pages/home.tsx
index b09fa33d8f..238add85a4 100644
--- a/packages/react-app-scaffolder/generators/app/templates/no-redux/src/components/pages/home.tsx
+++ b/packages/react-app-scaffolder/generators/app/templates/no-redux/src/components/pages/home.tsx
@@ -29,7 +29,7 @@ export const Home: React.FunctionComponent<HomeProps> = () => {
     <ErrorBoundary>
       <FlexContainerBasic hasPadding hasBackground>
         <FlexContainerResponsive flexColumn hasPadding hasBackground>
-          <H3>Welcome To Reapit Elements</H3>
+          <H3>Welcome To Reapit Foundations</H3>
           <SubTitleH5>
             Click <Link to="/login">here</Link> to login
           </SubTitleH5>
diff --git a/packages/react-app-scaffolder/generators/app/templates/redux/src/components/pages/authenticated.tsx b/packages/react-app-scaffolder/generators/app/templates/redux/src/components/pages/authenticated.tsx
index f26a146ba9..827a6e819d 100644
--- a/packages/react-app-scaffolder/generators/app/templates/redux/src/components/pages/authenticated.tsx
+++ b/packages/react-app-scaffolder/generators/app/templates/redux/src/components/pages/authenticated.tsx
@@ -13,7 +13,7 @@ export const Authenticated: React.FunctionComponent<AuthenticatedProps> = () =>
     <ErrorBoundary>
       <FlexContainerBasic hasPadding>
         <FlexContainerResponsive flexColumn hasPadding hasBackground>
-          <H3>Welcome To Reapit Elements</H3>
+          <H3>Welcome To Reapit Foundations</H3>
           <SubTitleH5>You are now authenticated against our sandbox data</SubTitleH5>
         </FlexContainerResponsive>
       </FlexContainerBasic>
diff --git a/packages/react-app-scaffolder/generators/app/templates/redux/src/components/pages/home.tsx b/packages/react-app-scaffolder/generators/app/templates/redux/src/components/pages/home.tsx
index b698b52b22..7b90d71ae1 100644
--- a/packages/react-app-scaffolder/generators/app/templates/redux/src/components/pages/home.tsx
+++ b/packages/react-app-scaffolder/generators/app/templates/redux/src/components/pages/home.tsx
@@ -20,7 +20,7 @@ export const Home: React.FunctionComponent<HomeProps> = () => {
     <ErrorBoundary>
       <FlexContainerBasic hasPadding hasBackground>
         <FlexContainerResponsive flexColumn hasPadding hasBackground>
-          <H3>Welcome To Reapit Elements</H3>
+          <H3>Welcome To Reapit Foundations</H3>
           <SubTitleH5>
             Click <Link to="/login">here</Link> to login
           </SubTitleH5>
diff --git a/packages/react-app-scaffolder/generators/app/templates/redux/src/components/ui/menu.tsx b/packages/react-app-scaffolder/generators/app/templates/redux/src/components/ui/menu.tsx
index 71a7271510..0d6b851458 100644
--- a/packages/react-app-scaffolder/generators/app/templates/redux/src/components/ui/menu.tsx
+++ b/packages/react-app-scaffolder/generators/app/templates/redux/src/components/ui/menu.tsx
@@ -28,8 +28,8 @@ export const generateMenuConfig = (
         icon: <FaCloud className="nav-item-icon" />,
         callback: () =>
           (window.location.href = !window.location.href.includes('dev')
-            ? 'https://marketplace.reapit.com/client/installed'
-            : 'https://dev.marketplace.reapit.com/client/installed'),
+            ? 'https://marketplace.reapit.cloud/client/installed'
+            : 'https://dev.marketplace.reapit.cloud/client/installed'),
         type: 'PRIMARY',
       },
       {
diff --git a/packages/smb/src/components/pages/home/home.tsx b/packages/smb/src/components/pages/home/home.tsx
index 109fbfa68d..9f3b89ba17 100644
--- a/packages/smb/src/components/pages/home/home.tsx
+++ b/packages/smb/src/components/pages/home/home.tsx
@@ -139,7 +139,7 @@ export const Home: React.FC<RouteComponentProps> = ({ location, history }: Route
   return (
     <FlexContainerBasic hasPadding hasBackground>
       <FlexContainerResponsive flexColumn hasPadding hasBackground>
-        <H3>Welcome To Reapit Elements</H3>
+        <H3>Welcome To Reapit Foundations</H3>
         {renderContent({
           loading,
           error,