diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index bfbaf1f71..70283f59b 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1,7 @@
 Thank you for reporting an issue, suggesting an enhancement, or asking a question. We appreciate your feedback - to help the team understand your
 needs please complete the below template to ensure we have the details to help. Thanks!
 
-**Please check out the [documentation](https://sharepoint.github.io/sp-dev-fx-controls-react/) to see if your question is already addressed there. This will help us ensure our documentation is up to date.**
+**Please check out the [documentation](https://pnp.github.io/sp-dev-fx-controls-react/) to see if your question is already addressed there. This will help us ensure our documentation is up to date.**
 
 #### Category
 [ ] Enhancement
diff --git a/README.md b/README.md
index 4ae0a57d4..f17081241 100644
--- a/README.md
+++ b/README.md
@@ -8,13 +8,13 @@ This is a open source library that shares a set of reusable React control that c
 
 ## Get Started
 
-More information to get started can be found documentation of this repository: [documentation](https://sharepoint.github.io/sp-dev-fx-controls-react/).
+More information to get started can be found documentation of this repository: [documentation](https://pnp.github.io/sp-dev-fx-controls-react/).
 
 # Have issues or questions?
 
 Please use following logic on submitting your questions or issues to right location to ensure that they are noticed and addressed as soon as possible.
 
-* You have general question or challenge with SPFx - use [sp-dev-docs repository issue list](https://github.com/pnp/sp-dev-docs/issues).
+* You have general question or challenge with SPFx - use [sp-dev-docs repository issue list](https://github.com/sharepoint/sp-dev-docs/issues).
 * You have issue on specific controls in this package - use [issue list in this repository](https://github.com/pnp/sp-dev-fx-controls-react/issues).
 
 
diff --git a/docs/documentation/docs/controls/WebPartTitle.md b/docs/documentation/docs/controls/WebPartTitle.md
index 6d6c536cb..102918e79 100644
--- a/docs/documentation/docs/controls/WebPartTitle.md
+++ b/docs/documentation/docs/controls/WebPartTitle.md
@@ -61,7 +61,7 @@ You can do this as like in the following example code:
               title={this.props.title}
               updateProperty={this.props.updateProperty}
               moreLink={
-                <Link href="https://sharepoint.github.io/sp-dev-fx-controls-react/">See all</Link>
+                <Link href="https://pnp.github.io/sp-dev-fx-controls-react/">See all</Link>
               } />
 ```
 
@@ -73,7 +73,7 @@ If you wish, you may pass a callback function instead, as per the following exam
               updateProperty={this.props.updateProperty}
               moreLink={
                 ()=> {
-                  return (<Link href="https://sharepoint.github.io/sp-dev-fx-controls-react/">See all</Link>);
+                  return (<Link href="https://pnp.github.io/sp-dev-fx-controls-react/">See all</Link>);
                 }
               } />
 ```
diff --git a/docs/documentation/docs/controls/fields/FieldNameRenderer.md b/docs/documentation/docs/controls/fields/FieldNameRenderer.md
index a2a377504..12b6f7b30 100644
--- a/docs/documentation/docs/controls/fields/FieldNameRenderer.md
+++ b/docs/documentation/docs/controls/fields/FieldNameRenderer.md
@@ -2,7 +2,7 @@
 
 This control renders document's name as a link. The link provides either preview (if it is available) or direct download. Additionally, new documents are marked with "Glimmer" icon.
 
-**Note:** The Name column in document libraries is marked as noneditable. See [this issue](https://github.com/pnp/sp-dev-docs/issues/1207) for details.
+**Note:** The Name column in document libraries is marked as noneditable. See [this issue](https://github.com/sharepoint/sp-dev-docs/issues/1207) for details.
 **Note** Glimmer icon displays correctly starting with SharePoint Framework v1.4
 
 ![FieldNameRenderer control output](../../assets/FieldNameRenderer.png)
diff --git a/package.json b/package.json
index a1f24f180..1a1f4ae1b 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     "url": "https://github.com/pnp/sp-dev-fx-controls-react/issues"
   },
   "main": "lib/index.js",
-  "homepage": "https://sharepoint.github.io/sp-dev-fx-controls-react/",
+  "homepage": "https://pnp.github.io/sp-dev-fx-controls-react/",
   "contributors": [
     "Gove, Russell <russellgove@gmail.com>",
     "Kent Chris <>",
diff --git a/src/controls/siteBreadcrumb/SiteBreadcrumb.test.tsx b/src/controls/siteBreadcrumb/SiteBreadcrumb.test.tsx
index c84a255f7..5b3389f26 100644
--- a/src/controls/siteBreadcrumb/SiteBreadcrumb.test.tsx
+++ b/src/controls/siteBreadcrumb/SiteBreadcrumb.test.tsx
@@ -12,7 +12,7 @@ declare const sinon;
 
 /**
  * DISCLAIMER: Currently does not work because of the following issue:
- * https://github.com/pnp/sp-dev-docs/issues/526
+ * https://github.com/sharepoint/sp-dev-docs/issues/526
  */
 
 // describe('<SiteBreadcrumb />', () => {
diff --git a/src/webparts/controlsTest/components/ControlsTest.tsx b/src/webparts/controlsTest/components/ControlsTest.tsx
index ad4c61c96..9f1ec8361 100644
--- a/src/webparts/controlsTest/components/ControlsTest.tsx
+++ b/src/webparts/controlsTest/components/ControlsTest.tsx
@@ -554,7 +554,7 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
           title={this.props.title}
           updateProperty={this.props.updateProperty}
           moreLink={
-            <Link href="https://sharepoint.github.io/sp-dev-fx-controls-react/">See all</Link>
+            <Link href="https://pnp.github.io/sp-dev-fx-controls-react/">See all</Link>
           } />
 
 
diff --git a/src/webparts/controlsTest/components/ControlsTest_SingleComponent.tsx b/src/webparts/controlsTest/components/ControlsTest_SingleComponent.tsx
index af1c75828..2e09b4d5c 100644
--- a/src/webparts/controlsTest/components/ControlsTest_SingleComponent.tsx
+++ b/src/webparts/controlsTest/components/ControlsTest_SingleComponent.tsx
@@ -455,7 +455,7 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
           title={this.props.title}
           updateProperty={this.props.updateProperty}
           moreLink={
-            <Link href="https://sharepoint.github.io/sp-dev-fx-controls-react/">See all</Link>
+            <Link href="https://pnp.github.io/sp-dev-fx-controls-react/">See all</Link>
           } />
             <div>Icon Picker</div>
             <div><IconPicker renderOption="dialog" currentIcon={'Warning'} onSave={(value)=>{console.log(value);}} buttonLabel="Icon Picker"></IconPicker></div>