diff --git a/packages/typegpu/src/core/resolve/tgpuResolve.ts b/packages/typegpu/src/core/resolve/tgpuResolve.ts
index a0b07a3475..48d52afe08 100644
--- a/packages/typegpu/src/core/resolve/tgpuResolve.ts
+++ b/packages/typegpu/src/core/resolve/tgpuResolve.ts
@@ -23,7 +23,7 @@ export interface TgpuResolveOptions {
    * This allows tracking the behavior of the resolution process, as well as
    * sharing state between calls to `tgpu.resolve`.
    *
-   * @default 'random'
+   * @default 'strict'
    */
   names?: 'strict' | 'random' | Namespace | undefined;
   /**
diff --git a/packages/typegpu/src/core/root/init.ts b/packages/typegpu/src/core/root/init.ts
index d5439452cb..a3544d67e8 100644
--- a/packages/typegpu/src/core/root/init.ts
+++ b/packages/typegpu/src/core/root/init.ts
@@ -670,13 +670,13 @@ class TgpuRootImpl extends WithBindingImpl implements TgpuRoot, ExperimentalTgpu
 export type InitOptions = {
   adapter?: GPURequestAdapterOptions | undefined;
   device?: (GPUDeviceDescriptor & { optionalFeatures?: Iterable<GPUFeatureName> }) | undefined;
-  /** @default 'random' */
+  /** @default 'strict' */
   unstable_names?: 'random' | 'strict' | undefined;
   /**
    * A custom shader code generator, used when resolving TypeGPU functions.
    * If not provided, the default WGSL generator will be used.
    */
-  shaderGenerator?: ShaderGenerator | undefined;
+  unstable_shaderGenerator?: ShaderGenerator | undefined;
   unstable_logOptions?: LogGeneratorOptions;
 };
 
@@ -685,13 +685,13 @@ export type InitOptions = {
  */
 export type InitFromDeviceOptions = {
   device: GPUDevice;
-  /** @default 'random' */
+  /** @default 'strict' */
   unstable_names?: 'random' | 'strict' | undefined;
   /**
    * A custom shader code generator, used when resolving TypeGPU functions.
    * If not provided, the default WGSL generator will be used.
    */
-  shaderGenerator?: ShaderGenerator | undefined;
+  unstable_shaderGenerator?: ShaderGenerator | undefined;
   unstable_logOptions?: LogGeneratorOptions;
 };
 
@@ -718,7 +718,8 @@ export async function init(options?: InitOptions): Promise<TgpuRoot> {
     adapter: adapterOpt,
     device: deviceOpt,
     unstable_names: names = 'strict',
-    unstable_logOptions,
+    unstable_logOptions: logOptions,
+    unstable_shaderGenerator: shaderGenerator,
   } = options ?? {};
 
   if (!navigator.gpu) {
@@ -754,7 +755,7 @@ export async function init(options?: InitOptions): Promise<TgpuRoot> {
     requiredFeatures: availableFeatures,
   });
 
-  return new TgpuRootImpl(device, names, true, unstable_logOptions ?? {}, options?.shaderGenerator);
+  return new TgpuRootImpl(device, names, true, logOptions ?? {}, shaderGenerator);
 }
 
 /**
@@ -767,13 +768,12 @@ export async function init(options?: InitOptions): Promise<TgpuRoot> {
  * ```
  */
 export function initFromDevice(options: InitFromDeviceOptions): TgpuRoot {
-  const { device, unstable_names: names = 'strict', unstable_logOptions } = options ?? {};
-
-  return new TgpuRootImpl(
+  const {
     device,
-    names,
-    false,
-    unstable_logOptions ?? {},
-    options?.shaderGenerator,
-  );
+    unstable_names: names = 'strict',
+    unstable_logOptions: logOptions,
+    unstable_shaderGenerator: shaderGenerator,
+  } = options ?? {};
+
+  return new TgpuRootImpl(device, names, false, logOptions ?? {}, shaderGenerator);
 }