diff --git a/nativescript-core/globals/polyfills/dialogs/dialogs.ts b/nativescript-core/globals/polyfills/dialogs/dialogs.ts
index c3dab6e54..7a23c9454 100644
--- a/nativescript-core/globals/polyfills/dialogs/dialogs.ts
+++ b/nativescript-core/globals/polyfills/dialogs/dialogs.ts
@@ -1,6 +1,6 @@
 import "../../core";
 import { installPolyfills } from "../polyfill-helpers";
 
-global.registerModule("tns-core-modules/ui/dialogs", () => require("../../../ui/dialogs"));
+global.registerModule("ui-dialogs", () => require("../../../ui/dialogs"));
 
-installPolyfills("tns-core-modules/ui/dialogs", ["alert", "confirm", "prompt", "login", "action"]);
+installPolyfills("ui-dialogs", ["alert", "confirm", "prompt", "login", "action"]);
diff --git a/nativescript-core/module.d.ts b/nativescript-core/module.d.ts
index 0c3411561..523d69a70 100644
--- a/nativescript-core/module.d.ts
+++ b/nativescript-core/module.d.ts
@@ -50,7 +50,7 @@ declare namespace NodeJS {
         /**
          *
          * @param name Name of the module to be loaded
-         * @param loadForUI Is this UI module is being loaded for UI from tns-core-modules/builder.
+         * @param loadForUI Is this UI module is being loaded for UI from @nativescript/core/ui/builder.
          * Xml, css/scss and js/ts modules for pages and custom-components should load with loadForUI=true.
          * Passing "true" will enable the HMR mechanics this module. Default value is false.
          */
diff --git a/nativescript-core/ui/builder/component-builder/component-builder.ts b/nativescript-core/ui/builder/component-builder/component-builder.ts
index 985e2427d..b140aa170 100644
--- a/nativescript-core/ui/builder/component-builder/component-builder.ts
+++ b/nativescript-core/ui/builder/component-builder/component-builder.ts
@@ -38,7 +38,7 @@ const createComponentInstance = profile("createComponentInstance", (elementName:
             resolvedModuleName = resolveModuleName(namespace, "");
             instanceModule = global.loadModule(resolvedModuleName, true);
         } else {
-            // load module from tns-core-modules/ui or mapped paths
+            // load module from @nativescript/core/ui or mapped paths
             resolvedModuleName = MODULES[elementName] || UI_PATH +
                 (elementName.toLowerCase().indexOf("layout") !== -1 ? "layouts/" : "") +
                 elementName.split(/(?=[A-Z])/).join("-").toLowerCase();
diff --git a/nativescript-core/ui/frame/frame.d.ts b/nativescript-core/ui/frame/frame.d.ts
index cc3797a2c..bd204e4b1 100644
--- a/nativescript-core/ui/frame/frame.d.ts
+++ b/nativescript-core/ui/frame/frame.d.ts
@@ -56,7 +56,7 @@ export class Frame extends View {
      * This method will require the module and will check for a Page property in the exports of the module.
      * @param pageModuleName The name of the module to require starting from the application root.
      * For example if you want to navigate to page called "myPage.js" in a folder called "subFolder" and your root folder is "app" you can call navigate method like this:
-     * const frames = require("tns-core-modules/ui/frame");
+     * const frames = require("@nativescript/core/ui/frame");
      * frames.topmost().navigate("app/subFolder/myPage");
      */
     navigate(pageModuleName: string);
diff --git a/nativescript-core/xml/xml.ts b/nativescript-core/xml/xml.ts
index ef4d93e9e..e3f426b87 100644
--- a/nativescript-core/xml/xml.ts
+++ b/nativescript-core/xml/xml.ts
@@ -1,4 +1,4 @@
-// TODO: Delete `tns-core-modules/xml/xml.js` from source control after
+// TODO: Delete `nativescript-core/xml/xml.js` from source control after
 // https://github.com/NativeScript/nativescript-dev-webpack/issues/932
 
 import * as definition from ".";