diff --git a/packages/snap-preact-demo/snap/src/modern.ts b/packages/snap-preact-demo/snap/src/modern.ts
index d417b7af14..d74d0a8169 100644
--- a/packages/snap-preact-demo/snap/src/modern.ts
+++ b/packages/snap-preact-demo/snap/src/modern.ts
@@ -1,4 +1,4 @@
 window.searchspring = window.searchspring || {};
-window.searchspring.initiator = 'snap-managed';
+window.searchspring.managed = true;
 
 import('./index');
diff --git a/packages/snap-preact-demo/snap/src/universal.ts b/packages/snap-preact-demo/snap/src/universal.ts
index 1111b6e7fc..f42a6051d5 100644
--- a/packages/snap-preact-demo/snap/src/universal.ts
+++ b/packages/snap-preact-demo/snap/src/universal.ts
@@ -3,21 +3,16 @@ import { polyfills } from '@searchspring/snap-preact';
 
 const promises = [];
 if (!('fetch' in window)) {
-	// @ts-ignore - types not important
-	promises.push(import('whatwg-fetch') as any);
+	promises.push(import('whatwg-fetch'));
 }
 if (!('Symbol' in window) || !('flatMap' in Array.prototype) || !('includes' in Array.prototype)) {
-	// @ts-ignore - types not important
-	promises.push(import('core-js/stable') as any);
+	promises.push(import('core-js/stable'));
 }
 promises.push(polyfills);
 Promise.all(promises).then(() => {
-	// @ts-ignore - types not important
 	window.searchspring = window.searchspring || {};
-	// @ts-ignore - types not important
+	window.searchspring.managed = true;
 	window.searchspring.build = 'universal';
-	// @ts-ignore - types not important
-	window.searchspring.initiator = 'snap-managed';
 
 	import('./index');
 });
diff --git a/packages/snap-preact-demo/snap/webpack.modern.js b/packages/snap-preact-demo/snap/webpack.modern.js
index 1e2e7d00ab..1ca78a6631 100644
--- a/packages/snap-preact-demo/snap/webpack.modern.js
+++ b/packages/snap-preact-demo/snap/webpack.modern.js
@@ -6,7 +6,7 @@ const branchName = childProcess.execSync('git rev-parse --abbrev-ref HEAD').toSt
 
 module.exports = merge(common, {
 	mode: 'production',
-	entry: './snap/src/index.ts',
+	entry: './snap/src/modern.ts',
 	output: {
 		path: path.resolve(__dirname, 'dist'),
 		filename: 'bundle.js',
diff --git a/packages/snap-preact-demo/templates/src/modern.ts b/packages/snap-preact-demo/templates/src/modern.ts
new file mode 100644
index 0000000000..d74d0a8169
--- /dev/null
+++ b/packages/snap-preact-demo/templates/src/modern.ts
@@ -0,0 +1,4 @@
+window.searchspring = window.searchspring || {};
+window.searchspring.managed = true;
+
+import('./index');
diff --git a/packages/snap-preact-demo/templates/src/universal.ts b/packages/snap-preact-demo/templates/src/universal.ts
index a6aca50571..f42a6051d5 100644
--- a/packages/snap-preact-demo/templates/src/universal.ts
+++ b/packages/snap-preact-demo/templates/src/universal.ts
@@ -3,14 +3,16 @@ import { polyfills } from '@searchspring/snap-preact';
 
 const promises = [];
 if (!('fetch' in window)) {
-	// @ts-ignore - types not important
-	promises.push(import('whatwg-fetch') as any);
+	promises.push(import('whatwg-fetch'));
 }
 if (!('Symbol' in window) || !('flatMap' in Array.prototype) || !('includes' in Array.prototype)) {
-	// @ts-ignore - types not important
-	promises.push(import('core-js/stable') as any);
+	promises.push(import('core-js/stable'));
 }
 promises.push(polyfills);
 Promise.all(promises).then(() => {
+	window.searchspring = window.searchspring || {};
+	window.searchspring.managed = true;
+	window.searchspring.build = 'universal';
+
 	import('./index');
 });
diff --git a/packages/snap-preact-demo/templates/webpack.modern.js b/packages/snap-preact-demo/templates/webpack.modern.js
index d78e3b22cf..e48d6a41b7 100644
--- a/packages/snap-preact-demo/templates/webpack.modern.js
+++ b/packages/snap-preact-demo/templates/webpack.modern.js
@@ -6,7 +6,7 @@ const branchName = childProcess.execSync('git rev-parse --abbrev-ref HEAD').toSt
 
 module.exports = merge(common, {
 	mode: 'production',
-	entry: './templates/src/index.ts',
+	entry: './templates/src/modern.ts',
 	output: {
 		path: path.resolve(__dirname, 'dist'),
 		filename: 'bundle.js',
diff --git a/packages/snap-preact/src/Snap.tsx b/packages/snap-preact/src/Snap.tsx
index c9030043aa..be560670d7 100644
--- a/packages/snap-preact/src/Snap.tsx
+++ b/packages/snap-preact/src/Snap.tsx
@@ -451,8 +451,8 @@ export class Snap {
 				});
 			}
 
-			const initiator = window?.searchspring?.initiator || 'self-snap';
-			const trackerConfig = deepmerge(this.config.tracker?.config || {}, { framework: `${initiator}/preact`, mode: this.mode });
+			const initiatorPrefix = window?.searchspring?.managed ? `managed/` : '';
+			const trackerConfig = deepmerge(this.config.tracker?.config || {}, { framework: `${initiatorPrefix}snap/preact`, mode: this.mode });
 			this.tracker = services?.tracker || new Tracker(trackerGlobals, trackerConfig);
 
 			// log version
diff --git a/packages/snap-tracker/src/Tracker.ts b/packages/snap-tracker/src/Tracker.ts
index bcf1e4da90..209c42d570 100644
--- a/packages/snap-tracker/src/Tracker.ts
+++ b/packages/snap-tracker/src/Tracker.ts
@@ -32,7 +32,7 @@ export class Tracker extends Beacon {
 
 	constructor(globals: TrackerGlobals, config?: TrackerConfig & BeaconConfig) {
 		config = deepmerge(defaultConfig, config || {});
-		config.initiator = `searchspring/${config.framework}/${version}`;
+		config.initiator = `athos/${config.framework}/${version}`;
 
 		super(globals, config);
 		if (typeof globals != 'object' || typeof globals.siteId != 'string') {