diff --git a/packages/client-core/src/admin/components/project/ProjectTable.tsx b/packages/client-core/src/admin/components/project/ProjectTable.tsx
index 5f0f3234bf..6ee1b888b5 100644
--- a/packages/client-core/src/admin/components/project/ProjectTable.tsx
+++ b/packages/client-core/src/admin/components/project/ProjectTable.tsx
@@ -122,7 +122,7 @@ export default function ProjectTable(props: { search: string }) {
           startIcon={<HiOutlineArrowPath />}
           size="small"
           className="mr-2 h-min whitespace-pre bg-theme-blue-secondary text-[#214AA6] disabled:opacity-50 dark:text-white"
-          disabled={project.name === '@etherealengine/default-project'}
+          disabled={project.name === 'etherealengine/default-project'}
           onClick={() =>
             PopoverState.showPopupover(
               <AddEditProjectModal update={true} inputProject={project} onSubmit={handleProjectUpdate} />
@@ -135,7 +135,7 @@ export default function ProjectTable(props: { search: string }) {
           startIcon={<GrGithub />}
           size="small"
           className="mr-2 h-min whitespace-pre bg-theme-blue-secondary text-[#214AA6] disabled:opacity-50 dark:text-white"
-          disabled={!project || !project.repositoryPath || project.name === '@etherealengine/default-project'}
+          disabled={!project || !project.repositoryPath || project.name === 'etherealengine/default-project'}
           onClick={() => {
             PopoverState.showPopupover(
               <ConfirmDialog
@@ -202,7 +202,7 @@ export default function ProjectTable(props: { search: string }) {
           startIcon={<HiOutlineTrash />}
           size="small"
           className="h-min whitespace-pre bg-theme-blue-secondary text-[#214AA6] disabled:opacity-50 dark:text-white"
-          disabled={project.name === '@etherealengine/default-project'}
+          disabled={project.name === 'etherealengine/default-project'}
           onClick={() => {
             PopoverState.showPopupover(
               <ConfirmDialog
@@ -247,7 +247,7 @@ export default function ProjectTable(props: { search: string }) {
         projectVersion: row.version,
         enabled: (
           <Toggle
-            disabled={row.name === '@etherealengine/default-project'}
+            disabled={row.name === 'etherealengine/default-project'}
             value={row.enabled}
             onChange={() => handleEnabledChange(row)}
           />
diff --git a/packages/client-core/src/admin/components/project/UpdateEngineModal.tsx b/packages/client-core/src/admin/components/project/UpdateEngineModal.tsx
index 33a47f5ae3..0dbb1ebd68 100644
--- a/packages/client-core/src/admin/components/project/UpdateEngineModal.tsx
+++ b/packages/client-core/src/admin/components/project/UpdateEngineModal.tsx
@@ -186,7 +186,7 @@ export default function UpdateEngineModal() {
             </div>
             <div className="grid gap-2">
               {projectState.projects.value
-                .filter((project) => project.name !== '@etherealengine/default-project' && project.repositoryPath)
+                .filter((project) => project.name !== 'etherealengine/default-project' && project.repositoryPath)
                 .map((project) => (
                   <div key={project.id} className="border border-theme-primary bg-theme-surfaceInput px-3.5 py-5">
                     <Checkbox
diff --git a/packages/client-core/src/user/functions/useUserAvatarThumbnail.ts b/packages/client-core/src/user/functions/useUserAvatarThumbnail.ts
index 7e9ee57ce0..19ef4970f2 100644
--- a/packages/client-core/src/user/functions/useUserAvatarThumbnail.ts
+++ b/packages/client-core/src/user/functions/useUserAvatarThumbnail.ts
@@ -27,7 +27,7 @@ import { config } from '@etherealengine/common/src/config'
 import { avatarPath, userAvatarPath, UserID } from '@etherealengine/common/src/schema.type.module'
 import { useFind, useGet } from '@etherealengine/spatial/src/common/functions/FeathersHooks'
 
-export const DEFAULT_PROFILE_IMG_PLACEHOLDER = `${config.client.fileServer}/projects/@etherealengine/default-project/assets/default-silhouette.svg`
+export const DEFAULT_PROFILE_IMG_PLACEHOLDER = `${config.client.fileServer}/projects/etherealengine/default-project/assets/default-silhouette.svg`
 
 export const useUserAvatarThumbnail = (userId?: UserID) => {
   const userAvatar = useFind(userAvatarPath, {
diff --git a/packages/common/tests/regex.test.ts b/packages/common/tests/regex.test.ts
index c9fa4e83ce..0b7e9603dc 100644
--- a/packages/common/tests/regex.test.ts
+++ b/packages/common/tests/regex.test.ts
@@ -252,23 +252,23 @@ describe('regex.test', () => {
     it('should match static asset URLs', () => {
       const positiveCases = [
         {
-          url: 'https://example.com/projects/@etherealengine/default-project/assets/images/logo.png',
-          projectName: '@etherealengine/default-project',
+          url: 'https://example.com/projects/etherealengine/default-project/assets/images/logo.png',
+          projectName: 'etherealengine/default-project',
           assetPath: 'assets/images/logo.png'
         },
         {
-          url: 'https://example.com/static-resources/@etherealengine/default-project/assets/images/logo.png',
-          projectName: '@etherealengine/default-project',
+          url: 'https://example.com/static-resources/etherealengine/default-project/assets/images/logo.png',
+          projectName: 'etherealengine/default-project',
           assetPath: 'assets/images/logo.png'
         },
         {
-          url: 'https://example.com/projects/@etherealengine/default-project/assets/animations/emotes.glb',
-          projectName: '@etherealengine/default-project',
+          url: 'https://example.com/projects/etherealengine/default-project/assets/animations/emotes.glb',
+          projectName: 'etherealengine/default-project',
           assetPath: 'assets/animations/emotes.glb'
         },
         {
-          url: 'https://example.com/projects/@etherealengine/default-project/assets/animations/locomotion.glb',
-          projectName: '@etherealengine/default-project',
+          url: 'https://example.com/projects/etherealengine/default-project/assets/animations/locomotion.glb',
+          projectName: 'etherealengine/default-project',
           assetPath: 'assets/animations/locomotion.glb'
         }
       ]
@@ -284,7 +284,7 @@ describe('regex.test', () => {
       const negativeCases = [
         'https://example.com/static-resources/',
         'https://example.com/project/subdir/assets',
-        'https://example.com/@etherealengine/default-project/assets/animations/emotes.glb'
+        'https://example.com/etherealengine/default-project/assets/animations/emotes.glb'
       ]
       negativeCases.forEach((url) => {
         assert.doesNotMatch(url, STATIC_ASSET_REGEX, `Expected '${url}' to not match STATIC_ASSET_REGEX`)
@@ -581,9 +581,9 @@ describe('regex.test', () => {
   describe('ASSETS_REGEX', () => {
     it('should match assets URLs', () => {
       const positiveCases = [
-        'https://example.com/projects/@etherealengine/default-project/assets/images/logo.png',
-        'https://example.com/projects/@etherealengine/default-project/assets/animations/emotes.glb',
-        'https://example.com/projects/@etherealengine/default-project/assets/animations/locomotion.glb'
+        'https://example.com/projects/etherealengine/default-project/assets/images/logo.png',
+        'https://example.com/projects/etherealengine/default-project/assets/animations/emotes.glb',
+        'https://example.com/projects/etherealengine/default-project/assets/animations/locomotion.glb'
       ]
       positiveCases.forEach((url) => {
         assert.match(url, ASSETS_REGEX, `Expected '${url}' to match ASSETS_REGEX`)
@@ -592,9 +592,9 @@ describe('regex.test', () => {
 
     it('should not match non-assets URLs', () => {
       const negativeCases = [
-        'https://example.com/projects/@etherealengine/default-project/scene.json',
-        'https://example.com/projects/@etherealengine/default-project/assets',
-        'https://example.com/@etherealengine/default-project/assets/animations/emotes.glb'
+        'https://example.com/projects/etherealengine/default-project/scene.json',
+        'https://example.com/projects/etherealengine/default-project/assets',
+        'https://example.com/etherealengine/default-project/assets/animations/emotes.glb'
       ]
       negativeCases.forEach((url) => {
         assert.doesNotMatch(url, ASSETS_REGEX, `Expected '${url}' to not match ASSETS_REGEX`)
@@ -605,9 +605,9 @@ describe('regex.test', () => {
   describe('PROJECT_REGEX', () => {
     it('should match valid project paths', () => {
       const positiveCases = [
-        'projects/@etherealengine/project123',
-        'projects/@etherealengine/project-name',
-        'projects/@etherealengine/project_name',
+        'projects/etherealengine/project123',
+        'projects/etherealengine/project-name',
+        'projects/etherealengine/project_name',
         'projects/project/123',
         'projects/project/abc_def'
       ]
@@ -630,9 +630,9 @@ describe('regex.test', () => {
   describe('PROJECT_PUBLIC_REGEX', () => {
     it('should match valid project paths', () => {
       const positiveCases = [
-        'projects/@etherealengine/project123/public/',
-        'projects/@etherealengine/project-name/public/',
-        'projects/@etherealengine/project_name/public/',
+        'projects/etherealengine/project123/public/',
+        'projects/etherealengine/project-name/public/',
+        'projects/etherealengine/project_name/public/',
         'projects/project/123/public/',
         'projects/project/abc_def/public/'
       ]
@@ -643,10 +643,10 @@ describe('regex.test', () => {
 
     it('should not match invalid project paths', () => {
       const negativeCases = [
-        'projects/@etherealengine/project123/public', // (missing trailing slash)
-        'projects/@etherealengine/project-name/private/', // (incorrect folder private instead of public)
-        'projects/@etherealengine/project$name/public/', // (contains invalid character $)
-        'projects/@etherealengine/project-@name/public/', // (contains invalid character @)
+        'projects/etherealengine/project123/public', // (missing trailing slash)
+        'projects/etherealengine/project-name/private/', // (incorrect folder private instead of public)
+        'projects/etherealengine/project$name/public/', // (contains invalid character $)
+        'projects/etherealengine/project-@name/public/', // (contains invalid character @)
         'projects/' // (missing project name and /public/)
       ]
       negativeCases.forEach((value) => {
@@ -658,9 +658,9 @@ describe('regex.test', () => {
   describe('PROJECT_THUMBNAIL_REGEX', () => {
     it('should match valid project thumbnail paths', () => {
       const positiveCases = [
-        'projects/@etherealengine/project123/thumbnails/',
-        'projects/@etherealengine/project-name/thumbnails/',
-        'projects/@etherealengine/project_name/thumbnails/',
+        'projects/etherealengine/project123/thumbnails/',
+        'projects/etherealengine/project-name/thumbnails/',
+        'projects/etherealengine/project_name/thumbnails/',
         'projects/project/123/thumbnails/',
         'projects/project/abc_def/thumbnails/'
       ]
@@ -671,10 +671,10 @@ describe('regex.test', () => {
 
     it('should not match invalid project thumbnail paths', () => {
       const negativeCases = [
-        'projects/@etherealengine/project123/thumbnails', // (missing trailing slash)
-        'projects/@etherealengine/project-name/private/', // (incorrect folder private instead of public)
-        'projects/@etherealengine/project$name/thumbnails/', // (contains invalid character $)
-        'projects/@etherealengine/project-@name/thumbnails/', // (contains invalid character @)
+        'projects/etherealengine/project123/thumbnails', // (missing trailing slash)
+        'projects/etherealengine/project-name/private/', // (incorrect folder private instead of public)
+        'projects/etherealengine/project$name/thumbnails/', // (contains invalid character $)
+        'projects/etherealengine/project-@name/thumbnails/', // (contains invalid character @)
         'projects/' // (missing project name and /thumbnail/)
       ]
       negativeCases.forEach((value) => {
diff --git a/packages/editor/src/components/prefabs/PrefabEditors.tsx b/packages/editor/src/components/prefabs/PrefabEditors.tsx
index 9c1de23f35..21c319662c 100644
--- a/packages/editor/src/components/prefabs/PrefabEditors.tsx
+++ b/packages/editor/src/components/prefabs/PrefabEditors.tsx
@@ -41,106 +41,106 @@ export const PrefabShelfState = defineState({
     [
       {
         name: '3D Model',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/3d-model.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/3d-model.prefab.gltf`,
         category: 'Geo',
         detail: 'Blank 3D model ready for your own assets'
       },
       {
         name: 'Primitive Geometry',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/geo.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/geo.prefab.gltf`,
         category: 'Geo'
       },
       {
         name: 'Ground Plane',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/ground-plane.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/ground-plane.prefab.gltf`,
         category: 'Geo'
       },
       {
         name: 'Point Light',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/point-light.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/point-light.prefab.gltf`,
         category: 'Lighting'
       },
       {
         name: 'Spot Light',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/spot-light.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/spot-light.prefab.gltf`,
         category: 'Lighting'
       },
       {
         name: 'Directional Light',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/directional-light.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/directional-light.prefab.gltf`,
         category: 'Lighting'
       },
       {
         name: 'Ambient Light',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/ambient-light.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/ambient-light.prefab.gltf`,
         category: 'Lighting'
       },
       {
         name: 'Hemisphere Light',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/hemisphere-light.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/hemisphere-light.prefab.gltf`,
         category: 'Lighting'
       },
       {
         name: 'Box Collider',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/box-collider.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/box-collider.prefab.gltf`,
         category: 'Collider',
         detail: 'Simple box collider'
       },
       {
         name: 'Sphere Collider',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/sphere-collider.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/sphere-collider.prefab.gltf`,
         category: 'Collider',
         detail: 'Simple sphere collider'
       },
       {
         name: 'Cylinder Collider',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/cylinder-collider.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/cylinder-collider.prefab.gltf`,
         category: 'Collider',
         detail: 'Simple cylinder collider'
       },
       {
         name: 'Text',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/text.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/text.prefab.gltf`,
         category: 'Text'
       },
       {
         name: 'Title',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/title.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/title.prefab.gltf`,
         category: 'Text'
       },
       {
         name: 'Body',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/body.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/body.prefab.gltf`,
         category: 'Text'
       },
       {
         name: 'Image',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/image.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/image.prefab.gltf`,
         category: 'Image'
       },
       {
         name: 'Video',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/video.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/video.prefab.gltf`,
         category: 'Video'
       },
       {
         name: 'Skybox',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/skybox.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/skybox.prefab.gltf`,
         category: 'Lookdev'
       },
       {
         name: 'Postprocessing',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/postprocessing.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/postprocessing.prefab.gltf`,
         category: 'Lookdev'
       },
       {
         name: 'Fog',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/fog.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/fog.prefab.gltf`,
         category: 'Lookdev'
       },
       {
         name: 'Camera',
-        url: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/prefabs/camera.prefab.gltf`,
+        url: `${config.client.fileServer}/projects/etherealengine/default-project/assets/prefabs/camera.prefab.gltf`,
         category: 'Camera'
       }
     ] as PrefabShelfItem[],
diff --git a/packages/editor/src/components/projects/ProjectsPage.tsx b/packages/editor/src/components/projects/ProjectsPage.tsx
index 9e95a6c5a3..9318401f56 100644
--- a/packages/editor/src/components/projects/ProjectsPage.tsx
+++ b/packages/editor/src/components/projects/ProjectsPage.tsx
@@ -367,7 +367,7 @@ const ProjectsPage = ({ studioPath }: { studioPath: string }) => {
             </a>
             <div className={styles.headerContainer} id={'headerContainer-' + project.name}>
               <h3 className={styles.header}>{project.name.replace(/-/g, ' ')}</h3>
-              {project.name !== '@etherealengine/default-project' && (
+              {project.name !== 'etherealengine/default-project' && (
                 <IconButton
                   className={styles.iconButton}
                   disableRipple
@@ -534,7 +534,7 @@ const ProjectsPage = ({ studioPath }: { studioPath: string }) => {
           </div>
         ) : null} */}
       </div>
-      {activeProjectValue?.name !== '@etherealengine/default-project' && (
+      {activeProjectValue?.name !== 'etherealengine/default-project' && (
         <Menu
           anchorEl={projectAnchorEl.value}
           open={Boolean(projectAnchorEl.value)}
diff --git a/packages/editor/src/functions/sceneFunctions.tsx b/packages/editor/src/functions/sceneFunctions.tsx
index 8fbc26c69e..bcfcf3e048 100644
--- a/packages/editor/src/functions/sceneFunctions.tsx
+++ b/packages/editor/src/functions/sceneFunctions.tsx
@@ -154,7 +154,7 @@ export const saveSceneGLTF = async (
 
 export const createScene = async (
   projectName: string,
-  templateURL = config.client.fileServer + '/projects/@etherealengine/default-project/public/scenes/default.gltf'
+  templateURL = config.client.fileServer + '/projects/etherealengine/default-project/public/scenes/default.gltf'
 ) => {
   const sceneData = await Engine.instance.api.service(fileBrowserPath).patch(null, {
     project: projectName,
@@ -168,7 +168,7 @@ export const createScene = async (
 }
 
 export const onNewScene = async (
-  templateURL = config.client.fileServer + '/projects/@etherealengine/default-project/public/scenes/default.gltf'
+  templateURL = config.client.fileServer + '/projects/etherealengine/default-project/public/scenes/default.gltf'
 ) => {
   const { projectName } = getState(EditorState)
   if (!projectName) return
diff --git a/packages/engine/src/avatar/animation/Util.ts b/packages/engine/src/avatar/animation/Util.ts
index 800d8de297..545413198f 100644
--- a/packages/engine/src/avatar/animation/Util.ts
+++ b/packages/engine/src/avatar/animation/Util.ts
@@ -74,7 +74,7 @@ export const preloadedAnimations = {
   emotes: 'emotes'
 }
 
-export const defaultAnimationPath = `${config.client.fileServer}/projects/@etherealengine/default-project/assets/animations/`
+export const defaultAnimationPath = `${config.client.fileServer}/projects/etherealengine/default-project/assets/animations/`
 
 export const matchesIkTarget = matches.some(
   ...Object.keys(ikTargets).map((k: keyof typeof ikTargets) => matches.literal(k))
diff --git a/packages/engine/src/avatar/functions/XRControllerFunctions.ts b/packages/engine/src/avatar/functions/XRControllerFunctions.ts
index 042b894320..5e077f8917 100644
--- a/packages/engine/src/avatar/functions/XRControllerFunctions.ts
+++ b/packages/engine/src/avatar/functions/XRControllerFunctions.ts
@@ -45,7 +45,7 @@ export const initializeControllerModel = async (entity: Entity, handedness: stri
   if (avatarInputControllerType !== AvatarControllerType.OculusQuest) return
 
   const [gltf] = await getGLTFAsync(
-    `${config.client.fileServer}/projects/@etherealengine/default-project/assets/controllers/${handedness}_controller.glb`
+    `${config.client.fileServer}/projects/etherealengine/default-project/assets/controllers/${handedness}_controller.glb`
   )
   let handMesh = gltf?.scene?.children[0]
 
@@ -85,7 +85,7 @@ export const initializeHandModel = async (entity: Entity, handedness: string) =>
   if (avatarInputControllerType === AvatarControllerType.None) return
 
   const [gltf] = await getGLTFAsync(
-    `${config.client.fileServer}/projects/@etherealengine/default-project/assets/controllers/${handedness}.glb`
+    `${config.client.fileServer}/projects/etherealengine/default-project/assets/controllers/${handedness}.glb`
   )
   const handMesh = gltf?.scene?.children[0]
 
diff --git a/packages/engine/src/avatar/systems/AvatarAnimationSystem.tsx b/packages/engine/src/avatar/systems/AvatarAnimationSystem.tsx
index d6a6c8ec1e..7d0f1e0276 100644
--- a/packages/engine/src/avatar/systems/AvatarAnimationSystem.tsx
+++ b/packages/engine/src/avatar/systems/AvatarAnimationSystem.tsx
@@ -331,7 +331,7 @@ const Reactor = () => {
   const animations = [preloadedAnimations.locomotion, preloadedAnimations.emotes]
   const [gltfs] = useBatchGLTF(
     animations.map((animationFile) => {
-      return `${config.client.fileServer}/projects/@etherealengine/default-project/assets/animations/${animationFile}.glb`
+      return `${config.client.fileServer}/projects/etherealengine/default-project/assets/animations/${animationFile}.glb`
     })
   )
   const manager = useMutableState(AnimationState)
diff --git a/packages/engine/src/scene/components/HyperspaceTagComponent.ts b/packages/engine/src/scene/components/HyperspaceTagComponent.ts
index cee7ce7872..3a0cc65d92 100644
--- a/packages/engine/src/scene/components/HyperspaceTagComponent.ts
+++ b/packages/engine/src/scene/components/HyperspaceTagComponent.ts
@@ -186,7 +186,7 @@ export const HyperspaceTagComponent = defineComponent({
   reactor: () => {
     const entity = useEntityContext()
     const [galaxyTexture] = useTexture(
-      `${config.client.fileServer}/projects/@etherealengine/default-project/assets/galaxyTexture.jpg`,
+      `${config.client.fileServer}/projects/etherealengine/default-project/assets/galaxyTexture.jpg`,
       entity
     )
 
diff --git a/packages/engine/src/scene/components/ImageComponent.ts b/packages/engine/src/scene/components/ImageComponent.ts
index 81b7189808..bc67730a1a 100644
--- a/packages/engine/src/scene/components/ImageComponent.ts
+++ b/packages/engine/src/scene/components/ImageComponent.ts
@@ -75,7 +75,7 @@ export const ImageComponent = defineComponent({
 
   onInit: (entity) => {
     return {
-      source: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/sample_etc1s.ktx2`,
+      source: `${config.client.fileServer}/projects/etherealengine/default-project/assets/sample_etc1s.ktx2`,
       alphaMode: ImageAlphaMode.Opaque as ImageAlphaModeType,
       alphaCutoff: 0.5,
       projection: ImageProjection.Flat as ImageProjectionType,
diff --git a/packages/engine/src/scene/components/SkyboxComponent.ts b/packages/engine/src/scene/components/SkyboxComponent.ts
index 9dafcf7a43..fd2156873c 100755
--- a/packages/engine/src/scene/components/SkyboxComponent.ts
+++ b/packages/engine/src/scene/components/SkyboxComponent.ts
@@ -55,7 +55,7 @@ export const SkyboxComponent = defineComponent({
     return {
       backgroundColor: new Color(0x000000),
       equirectangularPath: '',
-      cubemapPath: `${config.client.fileServer}/projects/@etherealengine/default-project/assets/skyboxsun25deg/`,
+      cubemapPath: `${config.client.fileServer}/projects/etherealengine/default-project/assets/skyboxsun25deg/`,
       backgroundType: 1,
       sky: null! as Sky | null,
       skyboxProps: {
diff --git a/packages/engine/src/scene/components/UVOL2Component.ts b/packages/engine/src/scene/components/UVOL2Component.ts
index d175572da9..461e5ab161 100644
--- a/packages/engine/src/scene/components/UVOL2Component.ts
+++ b/packages/engine/src/scene/components/UVOL2Component.ts
@@ -704,7 +704,6 @@ transformed.z += mix(keyframeA.z, keyframeB.z, mixRatio);
         undefined,
         'baseColor'
       )
-      // media.src = 'https://localhost:8642/projects/@etherealengine/default-project/ubx_kimberly_bird_t2_2k_std_30fps.mp4'
       mediaValue.preload = 'auto'
       media.addEventListener('loadeddata', () => {
         component.firstTextureFrameLoaded.set(true)
diff --git a/packages/engine/src/scene/systems/ShadowSystem.tsx b/packages/engine/src/scene/systems/ShadowSystem.tsx
index 69fee042f4..e7453f22cb 100644
--- a/packages/engine/src/scene/systems/ShadowSystem.tsx
+++ b/packages/engine/src/scene/systems/ShadowSystem.tsx
@@ -451,7 +451,7 @@ const reactor = () => {
   const useShadows = useShadowsEnabled()
 
   const [shadowTexture] = useTexture(
-    `${config.client.fileServer}/projects/@etherealengine/default-project/assets/drop-shadow.png`
+    `${config.client.fileServer}/projects/etherealengine/default-project/assets/drop-shadow.png`
   )
 
   useEffect(() => {
diff --git a/packages/projects/default-project/assets/prefabs/image.prefab.gltf b/packages/projects/default-project/assets/prefabs/image.prefab.gltf
index dafc2d134c..23c9d4d97b 100644
--- a/packages/projects/default-project/assets/prefabs/image.prefab.gltf
+++ b/packages/projects/default-project/assets/prefabs/image.prefab.gltf
@@ -18,7 +18,7 @@
         "EE_uuid": "0db4cf3f-8adb-42eb-8efa-3102182e61fc",
         "EE_visible": true,
         "EE_image": {
-          "source": "__$project$__/default-project/assets/sample_etc1s.ktx2",
+          "source": "__$project$__/etherealengine/default-project/assets/sample_etc1s.ktx2",
           "alphaMode": "Opaque",
           "alphaCutoff": 0.5,
           "projection": "Flat",
diff --git a/packages/projects/default-project/assets/prefabs/skybox.prefab.gltf b/packages/projects/default-project/assets/prefabs/skybox.prefab.gltf
index 3f82e5bd0a..32bb9fac4d 100644
--- a/packages/projects/default-project/assets/prefabs/skybox.prefab.gltf
+++ b/packages/projects/default-project/assets/prefabs/skybox.prefab.gltf
@@ -21,7 +21,7 @@
         "EE_skybox": {
           "backgroundColor": 0,
           "equirectangularPath": "",
-          "cubemapPath": "__$project$__/@etherealengine/default-project/assets/skyboxsun25deg/",
+          "cubemapPath": "__$project$__/etherealengine/default-project/assets/skyboxsun25deg/",
           "backgroundType": 1,
           "skyboxProps": {
             "turbidity": 10,
diff --git a/packages/projects/default-project/manifest.json b/packages/projects/default-project/manifest.json
index ce7427ef35..08d70161da 100644
--- a/packages/projects/default-project/manifest.json
+++ b/packages/projects/default-project/manifest.json
@@ -1,5 +1,5 @@
 {
-  "name": "@etherealengine/default-project",
+  "name": "etherealengine/default-project",
   "version": "0.0.0",
   "engineVersion": "1.6.0",
   "description": "The default project for iR Engine",
diff --git a/packages/projects/default-project/public/scenes/apartment.gltf b/packages/projects/default-project/public/scenes/apartment.gltf
index 9414147143..4d4b7181b2 100644
--- a/packages/projects/default-project/public/scenes/apartment.gltf
+++ b/packages/projects/default-project/public/scenes/apartment.gltf
@@ -57,7 +57,7 @@
           "bakeType": "Baked",
           "resolution": 2048,
           "refreshMode": "OnAwake",
-          "envMapOrigin": "__$project$__/@etherealengine/default-project/public/scenes/apartment.envmap.ktx2",
+          "envMapOrigin": "__$project$__/etherealengine/default-project/public/scenes/apartment.envmap.ktx2",
           "boxProjection": false
         },
         "EE_camera_settings": {
@@ -227,8 +227,8 @@
         },
         "EE_visible": true,
         "EE_scene_settings": {
-          "thumbnailURL": "__$project$__/@etherealengine/default-project/public/scenes/apartment.thumbnail.jpg",
-          "loadingScreenURL": "__$project$__/@etherealengine/default-project/public/scenes/apartment.loadingscreen.ktx2",
+          "thumbnailURL": "__$project$__/etherealengine/default-project/public/scenes/apartment.thumbnail.jpg",
+          "loadingScreenURL": "__$project$__/etherealengine/default-project/public/scenes/apartment.loadingscreen.ktx2",
           "primaryColor": "#A8B6C6",
           "backgroundColor": "rgb(64, 70, 71)",
           "alternativeColor": "#8EBBAE",
@@ -268,7 +268,7 @@
         "EE_visible": true,
         "EE_skybox": {
           "backgroundColor": 0,
-          "equirectangularPath": "__$project$__/@etherealengine/default-project/assets/apartment_skybox.jpg",
+          "equirectangularPath": "__$project$__/etherealengine/default-project/assets/apartment_skybox.jpg",
           "cubemapPath": "",
           "backgroundType": 2,
           "skyboxProps": {
@@ -428,14 +428,14 @@
         1
       ],
       "extras": {
-        "src": "__$project$__/@etherealengine/default-project/assets/apartment.glb"
+        "src": "__$project$__/etherealengine/default-project/assets/apartment.glb"
       },
       "name": "model",
       "extensions": {
         "EE_uuid": "b46b57c1-bd37-43cc-b000-8b4411fe728b",
         "EE_visible": true,
         "EE_model": {
-          "src": "__$project$__/@etherealengine/default-project/assets/apartment.glb",
+          "src": "__$project$__/etherealengine/default-project/assets/apartment.glb",
           "cameraOcclusion": true,
           "convertToVRM": false
         },
@@ -898,7 +898,7 @@
           "redirect": false,
           "effectType": "Hyperspace",
           "previewType": "Spherical",
-          "previewImageURL": "__$project$__/@etherealengine/default-project/public/scenes/apartment-Portal.ktx2",
+          "previewImageURL": "__$project$__/etherealengine/default-project/public/scenes/apartment-Portal.ktx2",
           "spawnPosition": {
             "x": -12,
             "y": 1,
@@ -1068,7 +1068,7 @@
         1
       ],
       "extras": {
-        "src": "__$project$__/@etherealengine/default-project/assets/keycard.glb"
+        "src": "__$project$__/etherealengine/default-project/assets/keycard.glb"
       },
       "name": "Model",
       "extensions": {
@@ -1079,7 +1079,7 @@
           "receive": true
         },
         "EE_model": {
-          "src": "__$project$__/@etherealengine/default-project/assets/keycard.glb",
+          "src": "__$project$__/etherealengine/default-project/assets/keycard.glb",
           "cameraOcclusion": false,
           "convertToVRM": false
         },
@@ -1100,7 +1100,7 @@
           "type": "Skybox",
           "envMapTextureType": "Cubemap",
           "envMapSourceColor": 1193046,
-          "envMapSourceURL": "__$project$__/@etherealengine/default-project/assets/skyboxsun25deg/",
+          "envMapSourceURL": "__$project$__/etherealengine/default-project/assets/skyboxsun25deg/",
           "envMapSourceEntityUUID": "",
           "envMapIntensity": 1
         }
@@ -1206,7 +1206,7 @@
           "bakeType": "Baked",
           "resolution": 1024,
           "refreshMode": "OnAwake",
-          "envMapOrigin": "__$project$__/@etherealengine/default-project/public/scenes/apartment-New-EnvMap%20Bake.ktx2",
+          "envMapOrigin": "__$project$__/etherealengine/default-project/public/scenes/apartment-New-EnvMap%20Bake.ktx2",
           "boxProjection": true
         },
         "EE_visible": true
diff --git a/packages/projects/default-project/public/scenes/default.gltf b/packages/projects/default-project/public/scenes/default.gltf
index 711307fb1d..d6441c59da 100644
--- a/packages/projects/default-project/public/scenes/default.gltf
+++ b/packages/projects/default-project/public/scenes/default.gltf
@@ -41,7 +41,7 @@
           "bakeType": "Baked",
           "resolution": 2048,
           "refreshMode": "OnAwake",
-          "envMapOrigin": "__$project$__/@etherealengine/default-project/public/scenes/default.envmap.ktx2",
+          "envMapOrigin": "__$project$__/etherealengine/default-project/public/scenes/default.envmap.ktx2",
           "boxProjection": true
         },
         "EE_fog": {
@@ -334,8 +334,8 @@
           "shadowMapType": 2
         },
         "EE_scene_settings": {
-          "thumbnailURL": "__$project$__/@etherealengine/default-project/public/scenes/default.thumbnail.jpg",
-          "loadingScreenURL": "__$project$__/@etherealengine/default-project/public/scenes/default.loadingscreen.ktx2",
+          "thumbnailURL": "__$project$__/etherealengine/default-project/public/scenes/default.thumbnail.jpg",
+          "loadingScreenURL": "__$project$__/etherealengine/default-project/public/scenes/default.loadingscreen.ktx2",
           "primaryColor": "#38620D",
           "backgroundColor": "rgb(214, 214, 211)",
           "alternativeColor": "#376312",
@@ -377,7 +377,7 @@
         "EE_skybox": {
           "backgroundColor": 3026478,
           "equirectangularPath": "",
-          "cubemapPath": "__$project$__/@etherealengine/default-project/assets/skyboxsun25deg/",
+          "cubemapPath": "__$project$__/etherealengine/default-project/assets/skyboxsun25deg/",
           "backgroundType": 0,
           "skyboxProps": {
             "turbidity": 10,
@@ -469,7 +469,7 @@
       "name": "platform",
       "extensions": {
         "EE_model": {
-          "src": "__$project$__/default-project/assets/platform.glb",
+          "src": "__$project$__/etherealengine/default-project/assets/platform.glb",
           "cameraOcclusion": true,
           "convertToVRM": false
         },
diff --git a/packages/projects/default-project/public/scenes/sky-station.gltf b/packages/projects/default-project/public/scenes/sky-station.gltf
index 1bc65256b3..6f0ce31ae3 100644
--- a/packages/projects/default-project/public/scenes/sky-station.gltf
+++ b/packages/projects/default-project/public/scenes/sky-station.gltf
@@ -33,7 +33,7 @@
           "bakeType": "Baked",
           "resolution": 1024,
           "refreshMode": "OnAwake",
-          "envMapOrigin": "__$project$__/@etherealengine/default-project/public/scenes/sky-station.envmap.ktx2",
+          "envMapOrigin": "__$project$__/etherealengine/default-project/public/scenes/sky-station.envmap.ktx2",
           "boxProjection": true
         },
         "EE_camera_settings": {
@@ -203,8 +203,8 @@
         },
         "EE_visible": true,
         "EE_scene_settings": {
-          "thumbnailURL": "__$project$__/@etherealengine/default-project/public/scenes/sky-station.thumbnail.jpg",
-          "loadingScreenURL": "__$project$__/@etherealengine/default-project/public/scenes/sky-station.loadingscreen.ktx2",
+          "thumbnailURL": "__$project$__/etherealengine/default-project/public/scenes/sky-station.thumbnail.jpg",
+          "loadingScreenURL": "__$project$__/etherealengine/default-project/public/scenes/sky-station.loadingscreen.ktx2",
           "primaryColor": "#0A6493",
           "backgroundColor": "rgb(238, 232, 243)",
           "alternativeColor": "#316F9E",
@@ -230,7 +230,7 @@
         "EE_uuid": "35621369-7e83-4878-953c-f30bf81dc775",
         "EE_skybox": {
           "backgroundColor": 0,
-          "equirectangularPath": "__$project$__/@etherealengine/default-project/assets/sky_skybox.jpg",
+          "equirectangularPath": "__$project$__/etherealengine/default-project/assets/sky_skybox.jpg",
           "cubemapPath": "",
           "backgroundType": 2,
           "skyboxProps": {
@@ -289,7 +289,7 @@
     {
       "matrix": [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -6.099999904632568, 1.2999999523162842, 0, 1],
       "extras": {
-        "src": "__$project$__/@etherealengine/default-project/assets/Skybase.glb"
+        "src": "__$project$__/etherealengine/default-project/assets/Skybase.glb"
       },
       "name": "Model",
       "extensions": {
@@ -299,7 +299,7 @@
           "receive": true
         },
         "EE_model": {
-          "src": "__$project$__/@etherealengine/default-project/assets/Skybase.glb",
+          "src": "__$project$__/etherealengine/default-project/assets/Skybase.glb",
           "cameraOcclusion": true,
           "convertToVRM": false
         },
@@ -320,7 +320,7 @@
           "type": "Texture",
           "envMapTextureType": "Equirectangular",
           "envMapSourceColor": 1193046,
-          "envMapSourceURL": "__$project$__/@etherealengine/default-project/assets/sky_skybox.jpg",
+          "envMapSourceURL": "__$project$__/etherealengine/default-project/assets/sky_skybox.jpg",
           "envMapSourceEntityUUID": "",
           "envMapIntensity": 1.5
         },
@@ -342,7 +342,7 @@
           "redirect": false,
           "effectType": "Hyperspace",
           "previewType": "Spherical",
-          "previewImageURL": "__$project$__/@etherealengine/default-project/public/scenes/sky-station-Portal--%20to%20Apartment.ktx2",
+          "previewImageURL": "__$project$__/etherealengine/default-project/public/scenes/sky-station-Portal--%20to%20Apartment.ktx2",
           "spawnPosition": {
             "x": 49.5,
             "y": 2,
@@ -403,7 +403,7 @@
           "redirect": false,
           "effectType": "None",
           "previewType": "Spherical",
-          "previewImageURL": "__$project$__/@etherealengine/default-project/public/scenes/sky-station-Portal--%20Sky%20Station%20Interior.ktx2",
+          "previewImageURL": "__$project$__/etherealengine/default-project/public/scenes/sky-station-Portal--%20Sky%20Station%20Interior.ktx2",
           "spawnPosition": {
             "x": 15,
             "y": 9,
@@ -464,7 +464,7 @@
           "redirect": false,
           "effectType": "None",
           "previewType": "Spherical",
-          "previewImageURL": "__$project$__/@etherealengine/default-project/public/scenes/sky-station-Portal--%20Sky%20Station%20Exterior.ktx2",
+          "previewImageURL": "__$project$__/etherealengine/default-project/public/scenes/sky-station-Portal--%20Sky%20Station%20Exterior.ktx2",
           "spawnPosition": {
             "x": -60,
             "y": 3,
diff --git a/packages/projects/default-project/resources.json b/packages/projects/default-project/resources.json
index 8c8b3fab71..2f8ab4980c 100644
--- a/packages/projects/default-project/resources.json
+++ b/packages/projects/default-project/resources.json
@@ -5,7 +5,7 @@
       "Model"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsanimationsdefault_skeleton.vrm-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsanimationsdefault_skeleton.vrm-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/animations/emotes.glb": {
@@ -21,7 +21,7 @@
       "Model"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsanimationslocomotion.glb-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsanimationslocomotion.glb-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/animations/optional/seated.fbx": {
@@ -37,7 +37,7 @@
       "Image"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsapartment_skybox.jpg-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsapartment_skybox.jpg-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/apartment-CubemapBake.png": {
@@ -53,7 +53,7 @@
       "Model"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsapartment.glb-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsapartment.glb-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/avatars/female_01.png": {
@@ -62,7 +62,7 @@
       "Image"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsavatarsfemale_01.png-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsavatarsfemale_01.png-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/avatars/female_01.vrm": {
@@ -71,7 +71,7 @@
       "Model"
     ],
     "dependencies": [
-      "projects/@etherealengine/default-project/assets/avatars/female_01.png"
+      "projects/etherealengine/default-project/assets/avatars/female_01.png"
     ]
   },
   "assets/avatars/female_02.png": {
@@ -80,7 +80,7 @@
       "Image"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsavatarsfemale_02.png-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsavatarsfemale_02.png-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/avatars/female_02.vrm": {
@@ -89,7 +89,7 @@
       "Model"
     ],
     "dependencies": [
-      "projects/@etherealengine/default-project/assets/avatars/female_02.png"
+      "projects/etherealengine/default-project/assets/avatars/female_02.png"
     ]
   },
   "assets/avatars/female_03.png": {
@@ -98,7 +98,7 @@
       "Image"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsavatarsfemale_03.png-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsavatarsfemale_03.png-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/avatars/female_03.vrm": {
@@ -107,9 +107,9 @@
       "Model"
     ],
     "dependencies": [
-      "projects/@etherealengine/default-project/assets/avatars/female_03.png"
+      "projects/etherealengine/default-project/assets/avatars/female_03.png"
     ],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsavatarsfemale_03.vrm-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsavatarsfemale_03.vrm-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/avatars/male_01.png": {
@@ -118,7 +118,7 @@
       "Image"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsavatarsmale_01.png-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsavatarsmale_01.png-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/avatars/male_01.vrm": {
@@ -127,9 +127,9 @@
       "Model"
     ],
     "dependencies": [
-      "projects/@etherealengine/default-project/assets/avatars/male_01.png"
+      "projects/etherealengine/default-project/assets/avatars/male_01.png"
     ],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsavatarsmale_01.vrm-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsavatarsmale_01.vrm-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/avatars/male_02.png": {
@@ -145,9 +145,9 @@
       "Model"
     ],
     "dependencies": [
-      "projects/@etherealengine/default-project/assets/avatars/male_02.png"
+      "projects/etherealengine/default-project/assets/avatars/male_02.png"
     ],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsavatarsmale_02.vrm-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsavatarsmale_02.vrm-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/avatars/male_03.png": {
@@ -156,7 +156,7 @@
       "Image"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsavatarsmale_03.png-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsavatarsmale_03.png-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/avatars/male_03.vrm": {
@@ -165,9 +165,9 @@
       "Model"
     ],
     "dependencies": [
-      "projects/@etherealengine/default-project/assets/avatars/male_03.png"
+      "projects/etherealengine/default-project/assets/avatars/male_03.png"
     ],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsavatarsmale_03.vrm-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsavatarsmale_03.vrm-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/cloud.png": {
@@ -176,7 +176,7 @@
       "Image"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetscloud.png-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetscloud.png-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/collisioncube.glb": {
@@ -185,7 +185,7 @@
       "Model"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetscollisioncube.glb-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetscollisioncube.glb-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/controllers/left_controller.glb": {
@@ -194,7 +194,7 @@
       "Model"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetscontrollersleft_controller.glb-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetscontrollersleft_controller.glb-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/controllers/left.glb": {
@@ -203,7 +203,7 @@
       "Model"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetscontrollersleft.glb-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetscontrollersleft.glb-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/controllers/right_controller.glb": {
@@ -219,7 +219,7 @@
       "Model"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetscontrollersright.glb-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetscontrollersright.glb-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/default-silhouette.svg": {
@@ -235,7 +235,7 @@
       "Image"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsdrop-shadow.png-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsdrop-shadow.png-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/galaxyTexture.jpg": {
@@ -244,7 +244,7 @@
       "Image"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsgalaxyTexture.jpg-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsgalaxyTexture.jpg-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/keycard.glb": {
@@ -253,7 +253,7 @@
       "Model"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetskeycard.glb-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetskeycard.glb-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/platform.glb": {
@@ -269,7 +269,7 @@
       "Model"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsportal_frame.glb-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsportal_frame.glb-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/prefabs/3d-model.prefab.gltf": {
@@ -285,7 +285,7 @@
       "Default Prefab"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsprefabsambient-light.prefab.gltf-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsprefabsambient-light.prefab.gltf-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/prefabs/body.prefab.gltf": {
@@ -301,7 +301,7 @@
       "Default Prefab"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsprefabsbox-collider.prefab.gltf-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsprefabsbox-collider.prefab.gltf-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/prefabs/camera.prefab.gltf": {
@@ -317,7 +317,7 @@
       "Default Prefab"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsprefabscylinder-collider.prefab.gltf-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsprefabscylinder-collider.prefab.gltf-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/prefabs/directional-light.prefab.gltf": {
@@ -326,7 +326,7 @@
       "Default Prefab"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsprefabsdirectional-light.prefab.gltf-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsprefabsdirectional-light.prefab.gltf-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/prefabs/fog.prefab.gltf": {
@@ -335,7 +335,7 @@
       "Default Prefab"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsprefabsfog.prefab.gltf-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsprefabsfog.prefab.gltf-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/prefabs/geo.prefab.gltf": {
@@ -344,7 +344,7 @@
       "Default Prefab"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsprefabsgeo.prefab.gltf-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsprefabsgeo.prefab.gltf-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/prefabs/ground-plane.prefab.gltf": {
@@ -360,7 +360,7 @@
       "Default Prefab"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsprefabshemisphere-light.prefab.gltf-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsprefabshemisphere-light.prefab.gltf-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/prefabs/image.prefab.gltf": {
@@ -383,7 +383,7 @@
       "Default Prefab"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsprefabspoint-light.prefab.gltf-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsprefabspoint-light.prefab.gltf-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/prefabs/postprocessing.prefab.gltf": {
@@ -392,7 +392,7 @@
       "Default Prefab"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsprefabspostprocessing.prefab.gltf-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsprefabspostprocessing.prefab.gltf-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/prefabs/skybox.prefab.gltf": {
@@ -401,7 +401,7 @@
       "Default Prefab"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsprefabsskybox.prefab.gltf-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsprefabsskybox.prefab.gltf-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/prefabs/sphere-collider.prefab.gltf": {
@@ -410,7 +410,7 @@
       "Default Prefab"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsprefabssphere-collider.prefab.gltf-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsprefabssphere-collider.prefab.gltf-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/prefabs/spot-light.prefab.gltf": {
@@ -419,7 +419,7 @@
       "Default Prefab"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsprefabsspot-light.prefab.gltf-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsprefabsspot-light.prefab.gltf-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/prefabs/text.prefab.gltf": {
@@ -428,7 +428,7 @@
       "Default Prefab"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsprefabstext.prefab.gltf-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsprefabstext.prefab.gltf-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/prefabs/title.prefab.gltf": {
@@ -451,7 +451,7 @@
       "Image"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetssample_etc1s.ktx2-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetssample_etc1s.ktx2-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/SampleAudio.mp3": {
@@ -467,7 +467,7 @@
       "Video"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsSampleVideo.mp4-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsSampleVideo.mp4-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/sky_skybox.jpg": {
@@ -476,7 +476,7 @@
       "Image"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetssky_skybox.jpg-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetssky_skybox.jpg-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/Skybase.glb": {
@@ -485,7 +485,7 @@
       "Model"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsSkybase.glb-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsSkybase.glb-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/skyboxsun25deg/negx.jpg": {
@@ -494,7 +494,7 @@
       "Image"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsskyboxsun25degnegx.jpg-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsskyboxsun25degnegx.jpg-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/skyboxsun25deg/negy.jpg": {
@@ -510,7 +510,7 @@
       "Image"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsskyboxsun25degnegz.jpg-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsskyboxsun25degnegz.jpg-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/skyboxsun25deg/posx.jpg": {
@@ -519,7 +519,7 @@
       "Image"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsskyboxsun25degposx.jpg-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsskyboxsun25degposx.jpg-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/skyboxsun25deg/posy.jpg": {
@@ -528,7 +528,7 @@
       "Image"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsskyboxsun25degposy.jpg-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsskyboxsun25degposy.jpg-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/skyboxsun25deg/posz.jpg": {
@@ -544,7 +544,7 @@
       "Model"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetstest-equippable.glb-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetstest-equippable.glb-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "assets/UV.png": {
@@ -553,7 +553,7 @@
       "Image"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/thumbnails/default-projectassetsUV.png-thumbnail.png",
+    "thumbnailKey": "projects/etherealengine/default-project/public/thumbnails/default-projectassetsUV.png-thumbnail.png",
     "thumbnailMode": "automatic"
   },
   "public/scenes/apartment-New-EnvMap Bake.ktx2": {
@@ -583,7 +583,7 @@
       "Model"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/scenes/apartment.thumbnail.jpg"
+    "thumbnailKey": "projects/etherealengine/default-project/public/scenes/apartment.thumbnail.jpg"
   },
   "public/scenes/apartment.loadingscreen.ktx2": {
     "type": "asset",
@@ -605,7 +605,7 @@
       "Model"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/scenes/default.thumbnail.jpg"
+    "thumbnailKey": "projects/etherealengine/default-project/public/scenes/default.thumbnail.jpg"
   },
   "public/scenes/default.loadingscreen.ktx2": {
     "type": "asset",
@@ -648,7 +648,7 @@
       "Model"
     ],
     "dependencies": [],
-    "thumbnailKey": "projects/@etherealengine/default-project/public/scenes/sky-station.thumbnail.jpg"
+    "thumbnailKey": "projects/etherealengine/default-project/public/scenes/sky-station.thumbnail.jpg"
   },
   "public/scenes/sky-station.loadingscreen.ktx2": {
     "type": "asset",
diff --git a/packages/projects/template-project/manifest.json b/packages/projects/template-project/manifest.json
index d1f15c9e8b..7e6ae79915 100644
--- a/packages/projects/template-project/manifest.json
+++ b/packages/projects/template-project/manifest.json
@@ -1,5 +1,5 @@
 {
-  "name": "ee-template",
+  "name": "etherealengine/ee-template",
   "version": "0.0.0",
   "engineVersion": "1.6.0",
   "description": "The default project for iR Engine",
diff --git a/packages/projects/template-project/package.json b/packages/projects/template-project/package.json
index ff5734a2b3..6893a42b9e 100644
--- a/packages/projects/template-project/package.json
+++ b/packages/projects/template-project/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "ee-template",
+  "name": "@etherealengine/ee-template",
   "version": "0.0.0",
   "scripts": {
     "test": "mocha --config .mocharc.js",
diff --git a/packages/server-core/src/media/static-resource/migrations/20240517215739_default_project_assets.ts b/packages/server-core/src/media/static-resource/migrations/20240517215739_default_project_assets.ts
index 6e71fdff84..ecce63cbc5 100644
--- a/packages/server-core/src/media/static-resource/migrations/20240517215739_default_project_assets.ts
+++ b/packages/server-core/src/media/static-resource/migrations/20240517215739_default_project_assets.ts
@@ -45,19 +45,19 @@ export async function up(knex: Knex): Promise<void> {
       for (const asset of assets) {
         if (
           asset.assetURL.startsWith('projects/default-project') &&
-          !asset.assetURL.startsWith('projects/@etherealengine/default-project/public/scenes')
+          !asset.assetURL.startsWith('projects/etherealengine/default-project/public/scenes')
         ) {
           await knex(assetPath)
             .where({ id: asset.id })
             .update({
               assetURL: asset.assetURL.replace(
                 'projects/default-project',
-                'projects/@etherealengine/default-project/public/scenes'
+                'projects/etherealengine/default-project/public/scenes'
               ),
               thumbnailURL: asset.thumbnailURL
                 ? asset.thumbnailURL.replace(
                     'projects/default-project',
-                    'projects/@etherealengine/default-project/public/scenes'
+                    'projects/etherealengine/default-project/public/scenes'
                   )
                 : null
             })
@@ -83,17 +83,17 @@ export async function down(knex: Knex): Promise<void> {
     if (project) {
       const assets = await knex.select().from(assetPath).where({ projectId: project.id })
       for (const asset of assets) {
-        if (asset.assetURL.startsWith('projects/@etherealengine/default-project/public/scenes')) {
+        if (asset.assetURL.startsWith('projects/etherealengine/default-project/public/scenes')) {
           await knex(assetPath)
             .where({ id: asset.id })
             .update({
               assetURL: asset.assetURL.replace(
-                'projects/@etherealengine/default-project/public/scenes',
+                'projects/etherealengine/default-project/public/scenes',
                 'projects/default-project'
               ),
               thumbnailURL: asset.thumbnailURL
                 ? asset.thumbnailURL.replace(
-                    'projects/@etherealengine/default-project/public/scenes',
+                    'projects/etherealengine/default-project/public/scenes',
                     'projects/default-project'
                   )
                 : null
diff --git a/packages/server-core/src/media/upload-asset/upload-asset.test.ts b/packages/server-core/src/media/upload-asset/upload-asset.test.ts
index 4876106dbd..cc4335b9e6 100644
--- a/packages/server-core/src/media/upload-asset/upload-asset.test.ts
+++ b/packages/server-core/src/media/upload-asset/upload-asset.test.ts
@@ -139,7 +139,7 @@ describe('upload-asset', () => {
 
   //   it('should add asset as a new static resource from url', async () => {
   //     const storageProvider = getStorageProvider()
-  //     const url = storageProvider.getCachedURL('/projects/@etherealengine/default-project/public/scenes/default.gltf')
+  //     const url = storageProvider.getCachedURL('/projects/etherealengine/default-project/public/scenes/default.gltf')
   //     const name = 'default.gltf'
   //     const hash = createStaticResourceHash(url)
 
diff --git a/packages/server-core/src/projects/project-permission/project-permission.test.ts b/packages/server-core/src/projects/project-permission/project-permission.test.ts
index 57519f8f7a..f84f22cd6b 100644
--- a/packages/server-core/src/projects/project-permission/project-permission.test.ts
+++ b/packages/server-core/src/projects/project-permission/project-permission.test.ts
@@ -43,7 +43,7 @@ import { destroyEngine } from '@etherealengine/ecs/src/Engine'
 import { Application } from '../../../declarations'
 import { createFeathersKoaApp } from '../../createApp'
 
-const newProjectName1 = '@org/projecttest_test_project_name_1'
+const newProjectName1 = 'org/projecttest_test_project_name_1'
 
 const cleanup = async (app: Application) => {
   const project1Dir = path.resolve(appRootPath.path, `packages/projects/projects/${newProjectName1.split('/')[0]}/`)
diff --git a/packages/server-core/src/projects/project/downloadProjects.ts b/packages/server-core/src/projects/project/downloadProjects.ts
index 5136f179ba..4ef92a9891 100755
--- a/packages/server-core/src/projects/project/downloadProjects.ts
+++ b/packages/server-core/src/projects/project/downloadProjects.ts
@@ -41,7 +41,7 @@ import logger from '../../ServerLogger'
  * @returns {Promise<boolean>}
  */
 export const download = async (projectName: string, storageProviderName?: string) => {
-  if (projectName === '@etherealengine/default-project') return
+  if (projectName === 'etherealengine/default-project') return
 
   const storageProvider = getStorageProvider(storageProviderName)
   try {
@@ -73,7 +73,7 @@ export const download = async (projectName: string, storageProviderName?: string
     )
 
     logger.info(`[ProjectLoader]: Successfully downloaded and mounted project "${projectName}".`)
-    // if (projectName !== '@etherealengine/default-project') {
+    // if (projectName !== 'etherealengine/default-project') {
     //   const npmInstallPromise = new Promise<void>((resolve) => {
     //     const npmInstallProcess = spawn('npm', ['install', '--legacy-peer-deps'], { cwd: localProjectDirectory })
     //     npmInstallProcess.once('exit', () => {
diff --git a/packages/server-core/src/projects/project/migrations/20240730104039_project-org-names.ts b/packages/server-core/src/projects/project/migrations/20240730104039_project-org-names.ts
index afc4d97d6b..4bf8bbe389 100644
--- a/packages/server-core/src/projects/project/migrations/20240730104039_project-org-names.ts
+++ b/packages/server-core/src/projects/project/migrations/20240730104039_project-org-names.ts
@@ -39,14 +39,14 @@ export async function up(knex: Knex): Promise<void> {
     for (const project of projects) {
       if (project.name === 'default-project') {
         await knex(projectPath).where('id', project.id).update({
-          name: '@etherealengine/default-project'
+          name: 'etherealengine/default-project'
         })
       } else if (project.repositoryPath) {
         const repositorySplit = project.repositoryPath.split('/')
         await knex(projectPath)
           .where('id', project.id)
           .update({
-            name: `@${repositorySplit[repositorySplit.length - 2].toLowerCase()}/${project.name}`
+            name: `${repositorySplit[repositorySplit.length - 2].toLowerCase()}/${project.name}`
           })
       }
     }
diff --git a/packages/server-core/src/projects/project/project-helper.ts b/packages/server-core/src/projects/project/project-helper.ts
index cf558bec07..ec25725b83 100644
--- a/packages/server-core/src/projects/project/project-helper.ts
+++ b/packages/server-core/src/projects/project/project-helper.ts
@@ -325,24 +325,12 @@ export const getProjectConfig = (projectName: string) => {
   }
 }
 export const getProjectManifest = (projectName: string): ManifestJson => {
-  const packageJsonPath = path.resolve(projectsRootFolder, projectName, 'package.json')
   const manifestJsonPath = path.resolve(projectsRootFolder, projectName, 'manifest.json')
   if (fs.existsSync(manifestJsonPath)) {
     const data = fs.readFileSync(manifestJsonPath)
     return JSON.parse(data.toString()) as ManifestJson
   }
-  if (fs.existsSync(packageJsonPath)) {
-    const data = fs.readFileSync(packageJsonPath)
-    const packageJson = JSON.parse(data.toString()) as ProjectPackageJsonType
-    return {
-      name: packageJson.name!,
-      version: packageJson.version!,
-      engineVersion: packageJson.etherealEngine?.version,
-      description: packageJson.description,
-      thumbnail: packageJson.etherealEngine?.thumbnail
-    }
-  }
-  throw new Error(`No manifest.json or package.json found in project '${projectName}'`)
+  throw new Error(`No manifest.json found in project '${projectName}'`)
 }
 
 export const engineVersion = (
@@ -371,29 +359,8 @@ export const getProjectManifestFromRemote = async (
       Buffer.from((blobResponse.data as { content: string }).content, 'base64').toString()
     ) as ManifestJson
   } catch (err) {
-    logger.warn("Error getting commit's package.json %s/%s %s", owner, repo, err.toString())
-
-    try {
-      const blobResponse = await octoKit.rest.repos.getContent({
-        owner,
-        repo,
-        path: 'package.json',
-        ref: sha
-      })
-      const packageJson = JSON.parse(
-        Buffer.from((blobResponse.data as { content: string }).content, 'base64').toString()
-      ) as ProjectPackageJsonType
-      return {
-        name: packageJson.name,
-        version: packageJson.version,
-        engineVersion: packageJson.etherealEngine?.version,
-        description: packageJson.description,
-        thumbnail: packageJson.etherealEngine?.thumbnail
-      } as ManifestJson
-    } catch (err) {
-      logger.error("Error getting commit's package.json %s/%s %s", owner, repo, err.toString())
-      return Promise.reject(err)
-    }
+    logger.error("Error getting commit's package.json %s/%s %s", owner, repo, err.toString())
+    return Promise.reject(err)
   }
 }
 
@@ -1300,7 +1267,7 @@ export const copyDefaultProject = () => {
   deleteFolderRecursive(path.join(projectsRootFolder, `default-project`))
   copyFolderRecursiveSync(
     path.join(appRootPath.path, 'packages/projects/default-project'),
-    path.join(projectsRootFolder, '@etherealengine')
+    path.join(projectsRootFolder, 'etherealengine')
   )
 }
 
@@ -1350,9 +1317,9 @@ export const updateProject = async (
   },
   params?: ProjectParams
 ) => {
-  if (data.sourceURL === '@etherealengine/default-project') {
+  if (data.sourceURL === 'etherealengine/default-project') {
     copyDefaultProject()
-    await uploadLocalProjectToProvider(app, '@etherealengine/default-project')
+    await uploadLocalProjectToProvider(app, 'etherealengine/default-project')
     if (params?.jobId) {
       const date = await getDateTimeSql()
       await app.service(apiJobPath).patch(params.jobId as string, {
@@ -1364,7 +1331,7 @@ export const updateProject = async (
       (await app.service(projectPath).find({
         query: {
           action: 'admin',
-          name: '@etherealengine/default-project',
+          name: 'etherealengine/default-project',
           $limit: 1
         }
       })) as Paginated<ProjectType>
diff --git a/packages/server-core/src/projects/project/project.class.ts b/packages/server-core/src/projects/project/project.class.ts
index 27be9e9c52..d44a3c3344 100644
--- a/packages/server-core/src/projects/project/project.class.ts
+++ b/packages/server-core/src/projects/project/project.class.ts
@@ -100,7 +100,7 @@ export class ProjectService<T = ProjectType, ServiceParams extends Params = Proj
     const data = (await super._find({ paginate: false })) as ProjectType[]
 
     for (const project of data) {
-      if (project.repositoryPath || project.name === '@etherealengine/default-project') {
+      if (project.repositoryPath || project.name === 'etherealengine/default-project') {
         const [orgName, projectName] = project.name.split('/')
 
         try {
diff --git a/packages/server-core/src/projects/project/project.hooks.ts b/packages/server-core/src/projects/project/project.hooks.ts
index 71cfd23123..f27c559506 100644
--- a/packages/server-core/src/projects/project/project.hooks.ts
+++ b/packages/server-core/src/projects/project/project.hooks.ts
@@ -229,11 +229,11 @@ const addDataToProjectResult = async (context: HookContext<ProjectService>) => {
   const data: ProjectType[] = context.result!['data'] ? context.result!['data'] : context.result
   for (const item of data) {
     try {
-      const packageJson = getProjectManifest(item.name)
-      item.thumbnail = packageJson.thumbnail || '/static/IR_thumbnail.jpg'
-      item.version = packageJson.version
-      item.engineVersion = packageJson.engineVersion
-      item.description = packageJson.description
+      const manifestJson = getProjectManifest(item.name)
+      item.thumbnail = manifestJson.thumbnail || '/static/IR_thumbnail.jpg'
+      item.version = manifestJson.version
+      item.engineVersion = manifestJson.engineVersion
+      item.description = manifestJson.description
       item.hasWriteAccess = context.projectPushIds.indexOf(item.id) > -1
     } catch (err) {
       //
@@ -285,7 +285,7 @@ const checkIfProjectExists = async (context: HookContext<ProjectService>) => {
  */
 const checkIfNameIsValid = async (context: HookContext<ProjectService>) => {
   if (
-    (!config.db.forceRefresh && context.projectName === '@etherealengine/default-project') ||
+    (!config.db.forceRefresh && context.projectName === 'etherealengine/default-project') ||
     context.projectName === 'template-project'
   )
     throw new Error(`[Projects]: Project name ${context.projectName} not allowed`)
diff --git a/packages/server-core/src/projects/projects/projects.test.ts b/packages/server-core/src/projects/projects/projects.test.ts
index c3cd54dbd0..933be45c6f 100644
--- a/packages/server-core/src/projects/projects/projects.test.ts
+++ b/packages/server-core/src/projects/projects/projects.test.ts
@@ -46,7 +46,7 @@ describe('projects.test', () => {
   it('should find the projects', async () => {
     const foundProjects = await app.service(projectsPath).find()
     assert.notEqual(
-      foundProjects.findIndex((project) => project === '@etherealengine/default-project'),
+      foundProjects.findIndex((project) => project === 'etherealengine/default-project'),
       -1
     )
   })
diff --git a/packages/server-core/src/route/route/route.seed.ts b/packages/server-core/src/route/route/route.seed.ts
index bcc39cef5c..08bcd95563 100644
--- a/packages/server-core/src/route/route/route.seed.ts
+++ b/packages/server-core/src/route/route/route.seed.ts
@@ -37,31 +37,31 @@ export async function seed(knex: Knex): Promise<void> {
   const seedData: RouteType[] = await Promise.all(
     [
       {
-        project: '@etherealengine/default-project',
+        project: 'etherealengine/default-project',
         route: '/'
       },
       {
-        project: '@etherealengine/default-project',
+        project: 'etherealengine/default-project',
         route: '/location'
       },
       {
-        project: '@etherealengine/default-project',
+        project: 'etherealengine/default-project',
         route: '/admin'
       },
       {
-        project: '@etherealengine/default-project',
+        project: 'etherealengine/default-project',
         route: '/studio'
       },
       {
-        project: '@etherealengine/default-project',
+        project: 'etherealengine/default-project',
         route: '/studio-old'
       },
       {
-        project: '@etherealengine/default-project',
+        project: 'etherealengine/default-project',
         route: '/capture'
       },
       {
-        project: '@etherealengine/default-project',
+        project: 'etherealengine/default-project',
         route: '/chat'
       }
     ].map(async (item) => ({
diff --git a/packages/server-core/src/seeder.ts b/packages/server-core/src/seeder.ts
index 90bf96ece6..ac81522af2 100644
--- a/packages/server-core/src/seeder.ts
+++ b/packages/server-core/src/seeder.ts
@@ -60,7 +60,7 @@ export async function seeder(app: Application, forceRefresh: boolean, prepareDb:
     }
     copyDefaultProject()
     if (config.kubernetes.enabled || config.testEnabled)
-      await app.service(projectPath)._seedProject('@etherealengine/default-project')
+      await app.service(projectPath)._seedProject('etherealengine/default-project')
   }
 
   if (!config.kubernetes.enabled && !config.testEnabled) await app.service(projectPath)._syncDevLocalProjects()
diff --git a/packages/server-core/src/social/location/location.test.ts b/packages/server-core/src/social/location/location.test.ts
index 827f9e41b2..fa87b11be5 100644
--- a/packages/server-core/src/social/location/location.test.ts
+++ b/packages/server-core/src/social/location/location.test.ts
@@ -55,7 +55,7 @@ describe('location.test', () => {
 
     const scene = await app.service(staticResourcePath).find({
       query: {
-        key: 'projects/@etherealengine/default-project/public/scenes/default.gltf'
+        key: 'projects/etherealengine/default-project/public/scenes/default.gltf'
       }
     })
 
diff --git a/packages/server-core/tests/util/createTestLocation.ts b/packages/server-core/tests/util/createTestLocation.ts
index bec34b4c17..aa7f1c0f12 100644
--- a/packages/server-core/tests/util/createTestLocation.ts
+++ b/packages/server-core/tests/util/createTestLocation.ts
@@ -34,7 +34,7 @@ export const createTestLocation = async (app: Application, params = { isInternal
 
   const scene = await app.service(staticResourcePath).find({
     query: {
-      key: 'projects/@etherealengine/default-project/public/scenes/default.gltf'
+      key: 'projects/etherealengine/default-project/public/scenes/default.gltf'
     }
   })
 
diff --git a/scripts/bump-project-versions.js b/scripts/bump-project-versions.js
index a36399a887..1c5fecd19a 100644
--- a/scripts/bump-project-versions.js
+++ b/scripts/bump-project-versions.js
@@ -36,7 +36,7 @@ cli.main(async () => {
     const serverPackageJSONPath = path.join(appRootPath.path, 'packages/server-core/package.json')
     const defaultProjectJSONPath = path.join(
       appRootPath.path,
-      'packages/projects/@etherealengine/default-project/package.json'
+      'packages/projects/etherealengine/default-project/package.json'
     )
     const templateProjectJSONPath = path.join(appRootPath.path, 'packages/projects/template-project/package.json')
     const serverPackageJSON = JSON.parse(fs.readFileSync(serverPackageJSONPath, { encoding: 'utf-8' }))
diff --git a/scripts/clone-project.ts b/scripts/clone-project.ts
index ff30881034..cd26220e81 100644
--- a/scripts/clone-project.ts
+++ b/scripts/clone-project.ts
@@ -76,7 +76,7 @@ const cloneRepo = async () => {
 
   /** Checkout branch and rebase */
   await execPromise(`git checkout ${branch} && git fetch -p && git rebase`, {
-    cwd: path.resolve(appRootPath.path, `packages/projects/projects/@${org}/${repo}`)
+    cwd: path.resolve(appRootPath.path, `packages/projects/projects/${org}/${repo}`)
   })
 }
 cli.main(async () => {
diff --git a/scripts/install-projects.js b/scripts/install-projects.js
index 87da18fe08..5c615a5d2b 100755
--- a/scripts/install-projects.js
+++ b/scripts/install-projects.js
@@ -61,8 +61,8 @@ async function installAllProjects() {
     await Promise.all(projects.map((project) => download(project.name)))
     const updatedProject = await app
       .service(projectPath)
-      .update('', { sourceURL: '@etherealengine/default-project' }, { isInternal: true, isJob: true })
-    const projectConfig = getProjectConfig('@etherealengine/default-project')
+      .update('', { sourceURL: 'etherealengine/default-project' }, { isInternal: true, isJob: true })
+    const projectConfig = getProjectConfig('etherealengine/default-project')
     if (projectConfig && projectConfig.onEvent)
       await onProjectEvent(app, updatedProject, projectConfig.onEvent, 'onUpdate')
     process.exit(0)