diff --git a/src/components/viewer/ComponentViewerStateCreator.test.tsx b/src/components/viewer/ComponentViewerStateCreator.test.tsx
index 3a33b8c..6565e4c 100644
--- a/src/components/viewer/ComponentViewerStateCreator.test.tsx
+++ b/src/components/viewer/ComponentViewerStateCreator.test.tsx
@@ -36,7 +36,7 @@ describe('ComponentViewerStateCreator', () => {
 
     it('should take fullscreen state from url', () => {
         const stateCreator = new ComponentViewerStateCreator(registries);
-        const state = stateCreator.stateFromUrl('fullScreen=true');
+        const state = stateCreator.stateFromUrl('_rcv_fs=true');
 
         expect(state.isFullScreen).toEqual(true);
     });
@@ -53,6 +53,6 @@ describe('ComponentViewerStateCreator', () => {
             selectedToolbarItem: ''
         });
 
-        expect(url).toEqual('registryName=core&demoName=demo-name&fullScreen=true');
+        expect(url).toEqual('_rcv_rname=core&_rcv_dname=demo-name&_rcv_fs=true');
     });
 });
\ No newline at end of file
diff --git a/src/components/viewer/ComponentViewerStateCreator.ts b/src/components/viewer/ComponentViewerStateCreator.ts
index 3d7c441..78f2fdd 100644
--- a/src/components/viewer/ComponentViewerStateCreator.ts
+++ b/src/components/viewer/ComponentViewerStateCreator.ts
@@ -5,12 +5,12 @@ import { Registry, Registries } from '../';
 import { DemoEntryAndRegistry } from '../registry/DemoEntryAndRegistry';
 
 const queryParamNames = {
-    registryName: 'registryName',
-    demoName: 'demoName',
-    entryTitle: 'entryTitle',
-    selectedToolbarItem: 'toolbarItem',
-    isFullScreen: 'fullScreen',
-    isHelpOn: 'help'
+    registryName: '_rcv_rname',
+    demoName: '_rcv_dname',
+    entryTitle: '_rcv_title',
+    selectedToolbarItem: '_rcv_titem',
+    isFullScreen: '_rcv_fs',
+    isHelpOn: '_rcv_help'
 };
 
 export class ComponentViewerStateCreator {