diff --git a/sandbox/src/App.js b/sandbox/src/App.js
index 127201f60..1282f112b 100755
--- a/sandbox/src/App.js
+++ b/sandbox/src/App.js
@@ -10,28 +10,28 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-import React from "react.js";
-import { BrowserRouter as Router, Route, Link } from "react-router-dom.js";
+import React from "react";
+import { BrowserRouter as Router, Route, Link } from "react-router-dom";
 
-import Home from "./Home.js";
-import Consent from "./Consent.js";
-import Personalization from "./Personalization.js";
-import PersonalizationSpa from "./PersonalizationSpa.js";
-import PersonalizationAjo from "./PersonalizationAjo.js";
-import PersonalizationProfile from "./PersonalizationProfile.js";
-import Links from "./Links.js";
-import EventMerge from "./EventMerge.js";
-import LargePayload from "./LargePayload.js";
-import OrgTwo from "./OrgTwo.js";
-import DualTag from "./DualTag.js";
-import RedirectOffers from "./RedirectOffers.js";
-import RedirectedNewPage from "./RedirectedNewPage.js";
-import PersonalizationAnalyticsClientSide from "./PersonalizationAnalyticsClientSide.js";
-import PersonalizationFormBased from "./PersonalizationFormBased.js";
-import Identity from "./Identity.js";
-import AlloyVersion from "./components/AlloyVersion.js";
-import ConfigOverrides from "./ConfigOverrides.jsx.js";
-import InAppMessages from "./components/InAppMessagesDemo/InAppMessages.js";
+import Home from "./Home";
+import Consent from "./Consent";
+import Personalization from "./Personalization";
+import PersonalizationSpa from "./PersonalizationSpa";
+import PersonalizationAjo from "./PersonalizationAjo";
+import PersonalizationProfile from "./PersonalizationProfile";
+import Links from "./Links";
+import EventMerge from "./EventMerge";
+import LargePayload from "./LargePayload";
+import OrgTwo from "./OrgTwo";
+import DualTag from "./DualTag";
+import RedirectOffers from "./RedirectOffers";
+import RedirectedNewPage from "./RedirectedNewPage";
+import PersonalizationAnalyticsClientSide from "./PersonalizationAnalyticsClientSide";
+import PersonalizationFormBased from "./PersonalizationFormBased";
+import Identity from "./Identity";
+import AlloyVersion from "./components/AlloyVersion";
+import ConfigOverrides from "./ConfigOverrides.jsx";
+import InAppMessages from "./components/InAppMessagesDemo/InAppMessages";
 
 const BasicExample = () => {
   return (
diff --git a/sandbox/src/ConfigOverrides.jsx b/sandbox/src/ConfigOverrides.jsx
index 419fa9e91..1919ba960 100644
--- a/sandbox/src/ConfigOverrides.jsx
+++ b/sandbox/src/ConfigOverrides.jsx
@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
 
-import React, { useState } from "react.js";
+import React, { useState } from "react";
 
 const defaultOverrides = {
   datastreamId: "",
diff --git a/sandbox/src/Consent.js b/sandbox/src/Consent.js
index c17b69f79..0600aad2c 100644
--- a/sandbox/src/Consent.js
+++ b/sandbox/src/Consent.js
@@ -1,9 +1,9 @@
-import React from "react.js";
-import ContentSecurityPolicy from "./components/ContentSecurityPolicy.js";
-import useSendPageViewEvent from "./useSendPageViewEvent.js";
+import React from "react";
+import ContentSecurityPolicy from "./components/ContentSecurityPolicy";
+import useSendPageViewEvent from "./useSendPageViewEvent";
 import "./Consent.css";
-import Configuration from "./components/Configuration.js";
-import Cookies from "./components/Cookies.js";
+import Configuration from "./components/Configuration";
+import Cookies from "./components/Cookies";
 
 const IAB_OPT_IN =
   "CO1Z4yuO1Z4yuAcABBENArCsAP_AAH_AACiQGCNX_T5eb2vj-3Zdt_tkaYwf55y3o-wzhhaIse8NwIeH7BoGP2MwvBX4JiQCGBAkkiKBAQdtHGhcCQABgIhRiTKMYk2MjzNKJLJAilsbe0NYCD9mnsHT3ZCY70--u__7P3fAwQgkwVLwCRIWwgJJs0ohTABCOICpBwCUEIQEClhoACAnYFAR6gAAAIDAACAAAAEEEBAIABAAAkIgAAAEBAKACIBAACAEaAhAARIEAsAJEgCAAVA0JACKIIQBCDgwCjlACAoAAAAA.YAAAAAAAAAAA";
diff --git a/sandbox/src/DualTag.js b/sandbox/src/DualTag.js
index f21139456..44e9e2276 100644
--- a/sandbox/src/DualTag.js
+++ b/sandbox/src/DualTag.js
@@ -1,6 +1,6 @@
-import React from "react.js";
-import UnsafeContentSecurityPolicy from "./components/UnsafeContentSecurityPolicy.js";
-import useSendPageViewEvent from "./useSendPageViewEvent.js";
+import React from "react";
+import UnsafeContentSecurityPolicy from "./components/UnsafeContentSecurityPolicy";
+import useSendPageViewEvent from "./useSendPageViewEvent";
 
 const loadLaunch = () => {
   const script = document.createElement("script");
diff --git a/sandbox/src/EventMerge.js b/sandbox/src/EventMerge.js
index 8b91a2092..94c352fa6 100644
--- a/sandbox/src/EventMerge.js
+++ b/sandbox/src/EventMerge.js
@@ -1,8 +1,8 @@
 /* eslint-disable no-console */
 
-import React, { useRef, useEffect } from "react.js";
-import ContentSecurityPolicy from "./components/ContentSecurityPolicy.js";
-import useSendPageViewEvent from "./useSendPageViewEvent.js";
+import React, { useRef, useEffect } from "react";
+import ContentSecurityPolicy from "./components/ContentSecurityPolicy";
+import useSendPageViewEvent from "./useSendPageViewEvent";
 
 export default function EventMerge() {
   useSendPageViewEvent();
diff --git a/sandbox/src/Home.js b/sandbox/src/Home.js
index e89dcef78..39e411c90 100644
--- a/sandbox/src/Home.js
+++ b/sandbox/src/Home.js
@@ -1,8 +1,8 @@
 /* eslint-disable no-console, func-names */
 
-import React from "react.js";
-import ContentSecurityPolicy from "./components/ContentSecurityPolicy.js";
-import useSendPageViewEvent from "./useSendPageViewEvent.js";
+import React from "react";
+import ContentSecurityPolicy from "./components/ContentSecurityPolicy";
+import useSendPageViewEvent from "./useSendPageViewEvent";
 
 const getIdentity = () => {
   window.alloy("getIdentity", { namespaces: ["ECID"] }).then(function (result) {
diff --git a/sandbox/src/Identity.js b/sandbox/src/Identity.js
index a5b67c0fd..94cf353b1 100644
--- a/sandbox/src/Identity.js
+++ b/sandbox/src/Identity.js
@@ -12,7 +12,7 @@
 
 /* eslint-disable no-console, func-names */
 
-import React, { useEffect, useState } from "react.js";
+import React, { useEffect, useState } from "react";
 
 const readCookies = () => {
   const cookies = {};
diff --git a/sandbox/src/LargePayload.js b/sandbox/src/LargePayload.js
index a4b97dc66..006411d71 100644
--- a/sandbox/src/LargePayload.js
+++ b/sandbox/src/LargePayload.js
@@ -1,6 +1,6 @@
-import React from "react.js";
-import ContentSecurityPolicy from "./components/ContentSecurityPolicy.js";
-import useSendPageViewEvent from "./useSendPageViewEvent.js";
+import React from "react";
+import ContentSecurityPolicy from "./components/ContentSecurityPolicy";
+import useSendPageViewEvent from "./useSendPageViewEvent";
 
 const makePayload =
   (size, times = 1) =>
diff --git a/sandbox/src/Links.js b/sandbox/src/Links.js
index d14691093..a46727be4 100644
--- a/sandbox/src/Links.js
+++ b/sandbox/src/Links.js
@@ -1,6 +1,6 @@
-import React from "react.js";
-import ContentSecurityPolicy from "./components/ContentSecurityPolicy.js";
-import useSendPageViewEvent from "./useSendPageViewEvent.js";
+import React from "react";
+import ContentSecurityPolicy from "./components/ContentSecurityPolicy";
+import useSendPageViewEvent from "./useSendPageViewEvent";
 
 const adobeLink = () => {
   window.alloy("sendEvent", {
diff --git a/sandbox/src/OrgTwo.js b/sandbox/src/OrgTwo.js
index bcc47f690..735864713 100644
--- a/sandbox/src/OrgTwo.js
+++ b/sandbox/src/OrgTwo.js
@@ -1,5 +1,5 @@
-import React from "react.js";
-import useSendPageViewEvent from "./useSendPageViewEvent.js";
+import React from "react";
+import useSendPageViewEvent from "./useSendPageViewEvent";
 
 export default function OrgTwo() {
   useSendPageViewEvent({ instanceName: "organizationTwo" });
diff --git a/sandbox/src/Personalization.js b/sandbox/src/Personalization.js
index 5f4b30a8e..ddea06bc8 100644
--- a/sandbox/src/Personalization.js
+++ b/sandbox/src/Personalization.js
@@ -1,6 +1,6 @@
-import React from "react.js";
-import ContentSecurityPolicy from "./components/ContentSecurityPolicy.js";
-import useSendPageViewEvent from "./useSendPageViewEvent.js";
+import React from "react";
+import ContentSecurityPolicy from "./components/ContentSecurityPolicy";
+import useSendPageViewEvent from "./useSendPageViewEvent";
 
 export default function Personalization() {
   useSendPageViewEvent();
diff --git a/sandbox/src/PersonalizationAjo.js b/sandbox/src/PersonalizationAjo.js
index cb372a679..f42f132ae 100644
--- a/sandbox/src/PersonalizationAjo.js
+++ b/sandbox/src/PersonalizationAjo.js
@@ -1,6 +1,6 @@
-import React from "react.js";
-import ContentSecurityPolicy from "./components/ContentSecurityPolicy.js";
-import useSendPageViewEvent from "./useSendPageViewEvent.js";
+import React from "react";
+import ContentSecurityPolicy from "./components/ContentSecurityPolicy";
+import useSendPageViewEvent from "./useSendPageViewEvent";
 
 export default function PersonalizationAjo() {
   useSendPageViewEvent({ instanceName: "cjmProd" });
diff --git a/sandbox/src/PersonalizationAnalyticsClientSide.js b/sandbox/src/PersonalizationAnalyticsClientSide.js
index 3abfaae23..3ad6eec94 100644
--- a/sandbox/src/PersonalizationAnalyticsClientSide.js
+++ b/sandbox/src/PersonalizationAnalyticsClientSide.js
@@ -1,6 +1,6 @@
-import React, { useEffect } from "react.js";
-import { Link, Route, Switch, useRouteMatch } from "react-router-dom.js";
-import ContentSecurityPolicy from "./components/ContentSecurityPolicy.js";
+import React, { useEffect } from "react";
+import { Link, Route, Switch, useRouteMatch } from "react-router-dom";
+import ContentSecurityPolicy from "./components/ContentSecurityPolicy";
 import {
   getFormBasedOffer,
   personalizationEvent,
diff --git a/sandbox/src/PersonalizationFormBased.js b/sandbox/src/PersonalizationFormBased.js
index 59639914e..9bf5f3871 100644
--- a/sandbox/src/PersonalizationFormBased.js
+++ b/sandbox/src/PersonalizationFormBased.js
@@ -1,6 +1,6 @@
-import React, { useEffect, useState } from "react.js";
-import ContentSecurityPolicy from "./components/ContentSecurityPolicy.js";
-import useSendPageViewEvent from "./useSendPageViewEvent.js";
+import React, { useEffect, useState } from "react";
+import ContentSecurityPolicy from "./components/ContentSecurityPolicy";
+import useSendPageViewEvent from "./useSendPageViewEvent";
 
 const SCOPES_FOR_PAGE = ["sandbox-personalization-page2"];
 
diff --git a/sandbox/src/PersonalizationProfile.js b/sandbox/src/PersonalizationProfile.js
index 0ae7aec36..d935516b8 100644
--- a/sandbox/src/PersonalizationProfile.js
+++ b/sandbox/src/PersonalizationProfile.js
@@ -1,6 +1,6 @@
-import React from "react.js";
-import ContentSecurityPolicy from "./components/ContentSecurityPolicy.js";
-import useSendPageViewEvent from "./useSendPageViewEvent.js";
+import React from "react";
+import ContentSecurityPolicy from "./components/ContentSecurityPolicy";
+import useSendPageViewEvent from "./useSendPageViewEvent";
 
 export default function Personalization() {
   useSendPageViewEvent({
diff --git a/sandbox/src/PersonalizationSpa.js b/sandbox/src/PersonalizationSpa.js
index 0b0dd4ace..1423f56c9 100644
--- a/sandbox/src/PersonalizationSpa.js
+++ b/sandbox/src/PersonalizationSpa.js
@@ -1,7 +1,7 @@
-import React, { useEffect, useState } from "react.js";
-import { Switch, Route, useRouteMatch, Link } from "react-router-dom.js";
-import ContentSecurityPolicy from "./components/ContentSecurityPolicy.js";
-import useSendPageViewEvent from "./useSendPageViewEvent.js";
+import React, { useEffect, useState } from "react";
+import { Switch, Route, useRouteMatch, Link } from "react-router-dom";
+import ContentSecurityPolicy from "./components/ContentSecurityPolicy";
+import useSendPageViewEvent from "./useSendPageViewEvent";
 
 const usePropositions = ({ viewName }) => {
   const [propositions, setPropositions] = useState(undefined);
diff --git a/sandbox/src/RedirectOffers.js b/sandbox/src/RedirectOffers.js
index 238e2d213..bd7dc3c82 100644
--- a/sandbox/src/RedirectOffers.js
+++ b/sandbox/src/RedirectOffers.js
@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 
-import React, { useEffect } from "react.js";
-import ContentSecurityPolicy from "./components/ContentSecurityPolicy.js";
+import React, { useEffect } from "react";
+import ContentSecurityPolicy from "./components/ContentSecurityPolicy";
 
 export default function RedirectOffers() {
   useEffect(() => {
diff --git a/sandbox/src/RedirectedNewPage.js b/sandbox/src/RedirectedNewPage.js
index b12de5c21..2b8f7fdf5 100644
--- a/sandbox/src/RedirectedNewPage.js
+++ b/sandbox/src/RedirectedNewPage.js
@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 
-import React, { useEffect } from "react.js";
-import ContentSecurityPolicy from "./components/ContentSecurityPolicy.js";
+import React, { useEffect } from "react";
+import ContentSecurityPolicy from "./components/ContentSecurityPolicy";
 
 export default function RedirectedNewPage() {
   useEffect(() => {
diff --git a/sandbox/src/components/AlloyVersion.js b/sandbox/src/components/AlloyVersion.js
index 6f5e618e9..cfe8f9416 100644
--- a/sandbox/src/components/AlloyVersion.js
+++ b/sandbox/src/components/AlloyVersion.js
@@ -9,7 +9,7 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
-import React, { useEffect, useState } from "react.js";
+import React, { useEffect, useState } from "react";
 
 const useAlloyVersion = (instanceName = "alloy") => {
   const [version, setVersion] = useState("0.0.0");
diff --git a/sandbox/src/components/Configuration.js b/sandbox/src/components/Configuration.js
index 2f86d9ef8..a229b24e3 100644
--- a/sandbox/src/components/Configuration.js
+++ b/sandbox/src/components/Configuration.js
@@ -1,4 +1,4 @@
-import React from "react.js";
+import React from "react";
 
 const getQueryStringParameter = (key) => {
   const searchParams = new URLSearchParams(window.location.search);
diff --git a/sandbox/src/components/ContentSecurityPolicy.js b/sandbox/src/components/ContentSecurityPolicy.js
index eab6b415d..f629006a4 100644
--- a/sandbox/src/components/ContentSecurityPolicy.js
+++ b/sandbox/src/components/ContentSecurityPolicy.js
@@ -10,8 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-import React from "react.js";
-import { Helmet } from "react-helmet.js";
+import React from "react";
+import { Helmet } from "react-helmet";
 
 export default function ContentSecurityPolicy() {
   return (
diff --git a/sandbox/src/components/Cookies.js b/sandbox/src/components/Cookies.js
index 52a8949de..8d454e20f 100644
--- a/sandbox/src/components/Cookies.js
+++ b/sandbox/src/components/Cookies.js
@@ -1,6 +1,6 @@
 /* eslint-disable no-console, func-names */
 
-import React, { useEffect, useState } from "react.js";
+import React, { useEffect, useState } from "react";
 
 const KONDUCTOR_COOKIE_PREFIX = "kndctr_5BFE274A5F6980A50A495C08_AdobeOrg_";
 const LEGACY_IDENTITY_COOKIE = "AMCV_5BFE274A5F6980A50A495C08%40AdobeOrg";
diff --git a/sandbox/src/components/InAppMessagesDemo/InAppMessages.js b/sandbox/src/components/InAppMessagesDemo/InAppMessages.js
index b09bef190..a778f4ace 100644
--- a/sandbox/src/components/InAppMessagesDemo/InAppMessages.js
+++ b/sandbox/src/components/InAppMessagesDemo/InAppMessages.js
@@ -1,6 +1,6 @@
 /* eslint-disable no-bitwise, no-console */
-import React, { useEffect, useState } from "react.js";
-import ContentSecurityPolicy from "../ContentSecurityPolicy.js";
+import React, { useEffect, useState } from "react";
+import ContentSecurityPolicy from "../ContentSecurityPolicy";
 import "./InAppMessagesStyle.css";
 
 const configKey =
diff --git a/sandbox/src/components/UnsafeContentSecurityPolicy.js b/sandbox/src/components/UnsafeContentSecurityPolicy.js
index 627ebb238..db610bf41 100644
--- a/sandbox/src/components/UnsafeContentSecurityPolicy.js
+++ b/sandbox/src/components/UnsafeContentSecurityPolicy.js
@@ -10,8 +10,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-import React from "react.js";
-import { Helmet } from "react-helmet.js";
+import React from "react";
+import { Helmet } from "react-helmet";
 
 export default function UnsafeContentSecurityPolicy() {
   return (
diff --git a/sandbox/src/index.js b/sandbox/src/index.js
index 383b39dc6..37ecbb3e5 100755
--- a/sandbox/src/index.js
+++ b/sandbox/src/index.js
@@ -11,10 +11,10 @@ governing permissions and limitations under the License.
 */
 
 import "@babel/polyfill";
-import React from "react.js";
-import ReactDOM from "react-dom.js";
-import App from "./App.js";
-import * as serviceWorker from "./serviceWorker.js";
+import React from "react";
+import ReactDOM from "react-dom";
+import App from "./App";
+import * as serviceWorker from "./serviceWorker";
 
 ReactDOM.render(<App />, document.getElementById("root"));
 
diff --git a/sandbox/src/personalizationAnalyticsClientSideHelper.js b/sandbox/src/personalizationAnalyticsClientSideHelper.js
index 44b35e9f7..dd8a557bb 100644
--- a/sandbox/src/personalizationAnalyticsClientSideHelper.js
+++ b/sandbox/src/personalizationAnalyticsClientSideHelper.js
@@ -4,7 +4,7 @@ import {
   getDisplayAnalyticsToken,
   getECID,
 } from "./analyticsTokenHandler";
-import { sendAnalyticsPayload } from "./DataInsertionAPI.js";
+import { sendAnalyticsPayload } from "./DataInsertionAPI";
 
 // this org is configured to have Analytics disabled thus it is A4T Client Side Logging
 const instanceName = "organizationTwo";
diff --git a/sandbox/src/useSendPageViewEvent.js b/sandbox/src/useSendPageViewEvent.js
index 172a627ff..ecab0cae7 100644
--- a/sandbox/src/useSendPageViewEvent.js
+++ b/sandbox/src/useSendPageViewEvent.js
@@ -10,7 +10,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-import { useEffect } from "react.js";
+import { useEffect } from "react";
 
 const isNonEmptyArray = (value) => Array.isArray(value) && value.length > 0;
 
@@ -29,7 +29,6 @@ export default ({
       xdm.web = {
         webPageDetails: {
           viewName,
-          pageName: viewName,
         },
       };
     }