diff --git a/modules/component-store/src/component-store.ts b/modules/component-store/src/component-store.ts
index d311059681..3e21b3c035 100644
--- a/modules/component-store/src/component-store.ts
+++ b/modules/component-store/src/component-store.ts
@@ -32,7 +32,9 @@ export interface SelectConfig {
   debounce?: boolean;
 }
 
-export const initialStateToken = new InjectionToken('ComponentStore InitState');
+export const INITIAL_STATE_TOKEN = new InjectionToken(
+  '@ngrx/component-store Initial State'
+);
 
 @Injectable()
 export class ComponentStore<T extends object> implements OnDestroy {
@@ -49,7 +51,7 @@ export class ComponentStore<T extends object> implements OnDestroy {
   // Needs to be after destroy$ is declared because it's used in select.
   readonly state$: Observable<T> = this.select((s) => s);
 
-  constructor(@Optional() @Inject(initialStateToken) defaultState?: T) {
+  constructor(@Optional() @Inject(INITIAL_STATE_TOKEN) defaultState?: T) {
     // State can be initialized either through constructor or setState.
     if (defaultState) {
       this.initState(defaultState);
diff --git a/modules/data/src/effects/entity-effects-scheduler.ts b/modules/data/src/effects/entity-effects-scheduler.ts
index 5808e3ce9f..dab9320800 100644
--- a/modules/data/src/effects/entity-effects-scheduler.ts
+++ b/modules/data/src/effects/entity-effects-scheduler.ts
@@ -4,5 +4,5 @@ import { SchedulerLike } from 'rxjs';
 // See https://github.com/ReactiveX/rxjs/blob/master/doc/marble-testing.md
 /** Token to inject a special RxJS Scheduler during marble tests. */
 export const ENTITY_EFFECTS_SCHEDULER = new InjectionToken<SchedulerLike>(
-  'EntityEffects Scheduler'
+  '@ngrx/data Entity Effects Scheduler'
 );
diff --git a/modules/data/src/entity-metadata/entity-metadata.ts b/modules/data/src/entity-metadata/entity-metadata.ts
index b2acbe6c27..b531cf0817 100644
--- a/modules/data/src/entity-metadata/entity-metadata.ts
+++ b/modules/data/src/entity-metadata/entity-metadata.ts
@@ -6,7 +6,7 @@ import { EntityDispatcherDefaultOptions } from '../dispatchers/entity-dispatcher
 import { EntityFilterFn } from './entity-filters';
 
 export const ENTITY_METADATA_TOKEN = new InjectionToken<EntityMetadataMap>(
-  '@ngrx/data/entity-metadata'
+  '@ngrx/data Entity Metadata'
 );
 
 /** Metadata that describe an entity type and its collection to @ngrx/data */
diff --git a/modules/data/src/reducers/constants.ts b/modules/data/src/reducers/constants.ts
index 3991f681f3..e8ae9b29cb 100644
--- a/modules/data/src/reducers/constants.ts
+++ b/modules/data/src/reducers/constants.ts
@@ -4,16 +4,16 @@ import { EntityCache } from './entity-cache';
 
 export const ENTITY_CACHE_NAME = 'entityCache';
 export const ENTITY_CACHE_NAME_TOKEN = new InjectionToken<string>(
-  '@ngrx/data/entity-cache-name'
+  '@ngrx/data Entity Cache Name'
 );
 
 export const ENTITY_CACHE_META_REDUCERS = new InjectionToken<
   MetaReducer<any, any>[]
->('@ngrx/data/entity-cache-meta-reducers');
+>('@ngrx/data Entity Cache Meta Reducers');
 export const ENTITY_COLLECTION_META_REDUCERS = new InjectionToken<
   MetaReducer<any, any>[]
->('@ngrx/data/entity-collection-meta-reducers');
+>('@ngrx/data Entity Collection Meta Reducers');
 
 export const INITIAL_ENTITY_CACHE_STATE = new InjectionToken<
   EntityCache | (() => EntityCache)
->('@ngrx/data/initial-entity-cache-state');
+>('@ngrx/data Initial Entity Cache State');
diff --git a/modules/data/src/selectors/entity-cache-selector.ts b/modules/data/src/selectors/entity-cache-selector.ts
index 88ec62d155..7b1dfba03d 100644
--- a/modules/data/src/selectors/entity-cache-selector.ts
+++ b/modules/data/src/selectors/entity-cache-selector.ts
@@ -8,7 +8,7 @@ import {
 
 export const ENTITY_CACHE_SELECTOR_TOKEN = new InjectionToken<
   MemoizedSelector<Object, EntityCache>
->('@ngrx/data/entity-cache-selector');
+>('@ngrx/data Entity Cache Selector');
 
 export const entityCacheSelectorProvider: FactoryProvider = {
   provide: ENTITY_CACHE_SELECTOR_TOKEN,
diff --git a/modules/data/src/utils/interfaces.ts b/modules/data/src/utils/interfaces.ts
index aad00107e3..dc1b2b587f 100644
--- a/modules/data/src/utils/interfaces.ts
+++ b/modules/data/src/utils/interfaces.ts
@@ -14,7 +14,7 @@ export interface EntityPluralNames {
 }
 
 export const PLURAL_NAMES_TOKEN = new InjectionToken<EntityPluralNames>(
-  '@ngrx/data/plural-names'
+  '@ngrx/data Plural Names'
 );
 
 export abstract class Pluralizer {
diff --git a/modules/effects/src/tokens.ts b/modules/effects/src/tokens.ts
index 517dcaa016..ca01eeb560 100644
--- a/modules/effects/src/tokens.ts
+++ b/modules/effects/src/tokens.ts
@@ -4,24 +4,21 @@ import { EffectsErrorHandler } from './effects_error_handler';
 export const _ROOT_EFFECTS_GUARD = new InjectionToken<void>(
   '@ngrx/effects Internal Root Guard'
 );
-export const IMMEDIATE_EFFECTS = new InjectionToken<any[]>(
-  'ngrx/effects: Immediate Effects'
-);
 export const USER_PROVIDED_EFFECTS = new InjectionToken<Type<any>[][]>(
-  'ngrx/effects: User Provided Effects'
+  '@ngrx/effects User Provided Effects'
 );
 export const _ROOT_EFFECTS = new InjectionToken<Type<any>[]>(
-  'ngrx/effects: Internal Root Effects'
+  '@ngrx/effects Internal Root Effects'
 );
 export const ROOT_EFFECTS = new InjectionToken<Type<any>[]>(
-  'ngrx/effects: Root Effects'
+  '@ngrx/effects Root Effects'
 );
 export const _FEATURE_EFFECTS = new InjectionToken<Type<any>[]>(
-  'ngrx/effects: Internal Feature Effects'
+  '@ngrx/effects Internal Feature Effects'
 );
 export const FEATURE_EFFECTS = new InjectionToken<any[][]>(
-  'ngrx/effects: Feature Effects'
+  '@ngrx/effects Feature Effects'
 );
 export const EFFECTS_ERROR_HANDLER = new InjectionToken<EffectsErrorHandler>(
-  'ngrx/effects: Effects Error Handler'
+  '@ngrx/effects Effects Error Handler'
 );
diff --git a/modules/store-devtools/src/config.ts b/modules/store-devtools/src/config.ts
index 3fc22655ec..25e8b273f8 100644
--- a/modules/store-devtools/src/config.ts
+++ b/modules/store-devtools/src/config.ts
@@ -39,10 +39,10 @@ export class StoreDevtoolsConfig {
 }
 
 export const STORE_DEVTOOLS_CONFIG = new InjectionToken<StoreDevtoolsConfig>(
-  '@ngrx/devtools Options'
+  '@ngrx/store-devtools Options'
 );
 export const INITIAL_OPTIONS = new InjectionToken<StoreDevtoolsConfig>(
-  '@ngrx/devtools Initial Config'
+  '@ngrx/store-devtools Initial Config'
 );
 
 export type StoreDevtoolsOptions =
diff --git a/modules/store-devtools/src/extension.ts b/modules/store-devtools/src/extension.ts
index 4847383ff0..b09aaafd73 100644
--- a/modules/store-devtools/src/extension.ts
+++ b/modules/store-devtools/src/extension.ts
@@ -41,7 +41,7 @@ export const ExtensionActionTypes = {
 
 export const REDUX_DEVTOOLS_EXTENSION = new InjectionToken<
   ReduxDevtoolsExtension
->('Redux Devtools Extension');
+>('@ngrx/store-devtools Redux Devtools Extension');
 
 export interface ReduxDevtoolsExtensionConnection {
   subscribe(listener: (change: any) => void): void;
diff --git a/modules/store-devtools/src/instrument.ts b/modules/store-devtools/src/instrument.ts
index 9f32518ed5..ef186e4500 100644
--- a/modules/store-devtools/src/instrument.ts
+++ b/modules/store-devtools/src/instrument.ts
@@ -19,7 +19,7 @@ import {
 import { DevtoolsDispatcher } from './devtools-dispatcher';
 
 export const IS_EXTENSION_OR_MONITOR_PRESENT = new InjectionToken<boolean>(
-  'Is Devtools Extension or Monitor Present'
+  '@ngrx/store-devtools Is Devtools Extension or Monitor Present'
 );
 
 export function createIsExtensionOrMonitorPresent(