diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index abcfc35e..85d31914 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -76,7 +76,7 @@ Reproduction repository:
 <!--
 If possible, please create a repository that reproduces the issue with the
 minimal amount of code possible. You may fork the template here:
-https://github.com/alexkrolick/dom-testing-library-template
+https://github.com/testing-library/dom-testing-library-template
 
 Or if you can, try to reproduce the issue in a codesandbox. You can fork the
 one here: https://codesandbox.io/s/5z6x4r7n0p
diff --git a/.github/ISSUE_TEMPLATE/Bug_Report.md b/.github/ISSUE_TEMPLATE/Bug_Report.md
index 6e22b369..daefe8c6 100644
--- a/.github/ISSUE_TEMPLATE/Bug_Report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_Report.md
@@ -46,7 +46,7 @@ var your => (code) => here;
 
 <!--
 If this is an issue with documentation, please file an issue on the docs repo:
-https://github.com/alexkrolick/testing-library-docs
+https://github.com/testing-library/testing-library-docs
 -->
 
 ### What you did:
@@ -63,7 +63,7 @@ https://github.com/alexkrolick/testing-library-docs
 If possible, please create a repository that reproduces the issue with the
 minimal amount of code possible.
 
-Template repo: https://github.com/alexkrolick/dom-testing-library-template
+Template repo: https://github.com/testing-library/dom-testing-library-template
 
 Or if you can, try to reproduce the issue in a Codesandbox. You can fork the one
 here: https://codesandbox.io/s/5z6x4r7n0p
diff --git a/.github/ISSUE_TEMPLATE/Question.md b/.github/ISSUE_TEMPLATE/Question.md
index 3fd359af..3a4d1ca2 100644
--- a/.github/ISSUE_TEMPLATE/Question.md
+++ b/.github/ISSUE_TEMPLATE/Question.md
@@ -20,6 +20,6 @@ codesandbox to make a reproduction of your issue: https://kcd.im/rtl-help
 - Reactiflux on Discord https://www.reactiflux.com
 - Stack Overflow
   https://stackoverflow.com/questions/tagged/react-testing-library
-- Documentation: https://github.com/alexkrolick/testing-library-docs
+- Documentation: https://github.com/testing-library/testing-library-docs
 
 **ISSUES WHICH ARE QUESTIONS WILL BE CLOSED**
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index e3b54b33..371a86f6 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -35,7 +35,7 @@ merge of your pull request!
 <!-- to check an item, place an "x" in the box like so: "- [x] Documentation" -->
 
 - [ ] Documentation added to the
-      [docs site](https://github.com/alexkrolick/testing-library-docs)
+      [docs site](https://github.com/testing-library/testing-library-docs)
 - [ ] Tests
 - [ ] Typescript definitions updated
 - [ ] Ready to be merged
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index de766c7a..f3867b62 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -34,8 +34,13 @@ sure to include those changes (if they exist) in your commit.
 
 ### Update Typings
 
-The TypeScript type definitions are in the
-[DefinitelyTyped repo](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/testing-library__react)
+If your PR introduced some changes in the API, you are more than welcome to
+modify the Typescript type definition to reflect those changes. Just modify the
+`/types/index.d.ts` file accordingly. If you have never seen Typescript
+definitions before, you can read more about it in its
+[documentation pages](https://www.typescriptlang.org/docs/handbook/declaration-files/introduction.html).
+Though this library itself is not written in Typescript we use
+[dtslint](https://github.com/microsoft/dtslint) to lint our typings.
 
 ## Help needed