Merge branch 'master' into update_to_new_org_name_in_urls
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0ecf8a6..68cfcc2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,7 +15,7 @@
     *   Your issue may be resolved by upgrading to the latest version of the
         library. (Reach out to the product/app team if you're not the developer!)
     *   If you are using a
-        [port](http://github.com/googlei18n/libphonenumber#third-party-ports),
+        [port](http://github.com/google/libphonenumber#third-party-ports),
         issues should be reported against that project.
     *   If you are using the library through a front-end or wrapper, issues
         should be reported against that project.
@@ -68,7 +68,7 @@
 **By signing the CLA, you confirm that you have the rights to share the
 information with us, and that we may use, modify, reproduce, publicly display,
 and distribute the information in accordance with the library's [open source
-license](http://github.com/googlei18n/libphonenumber/blob/master/LICENSE).**
+license](http://github.com/google/libphonenumber/blob/master/LICENSE).**
 
 *   [Corporate CLA](http://developers.google.com/open-source/cla/corporate?csw=1):
     *   See https://cla.developers.google.com/about and follow the instructions.
diff --git a/FAQ.md b/FAQ.md
index 120ab9a..6590597 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -26,7 +26,7 @@
 If the input looks like a vanity number to the library, `parse()` assumes this
 is intentional and converts alpha characters to digits. Please read the
 documentation for `PhoneNumber parse(String, String)` in
-[PhoneNumberUtil](http://github.com/googlei18n/libphonenumber/blob/master/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java)
+[PhoneNumberUtil](http://github.com/google/libphonenumber/blob/master/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java)
 for details. Also see `Iterable<PhoneNumberMatch> findNumbers(CharSequence,
 String)`.
 
@@ -46,10 +46,10 @@
 
 Other examples, in reports:
 
-*   [#328](http://github.com/googlei18n/libphonenumber/issues/328)
-*   [#1001](http://github.com/googlei18n/libphonenumber/issues/1001)
-*   [#1199](http://github.com/googlei18n/libphonenumber/issues/1199)
-*   [#1813](http://github.com/googlei18n/libphonenumber/issues/1813)
+*   [#328](http://github.com/google/libphonenumber/issues/328)
+*   [#1001](http://github.com/google/libphonenumber/issues/1001)
+*   [#1199](http://github.com/google/libphonenumber/issues/1199)
+*   [#1813](http://github.com/google/libphonenumber/issues/1813)
 
 ### Why wasn't the national prefix removed when parsing?
 
@@ -88,7 +88,7 @@
 
 You can try [the demo](http://libphonenumber.appspot.com/) for more regions.
 Also see `internationalPrefix` in
-[`resources/PhoneNumberMetadata.xml`](http://github.com/googlei18n/libphonenumber/blob/master/resources/PhoneNumberMetadata.xml).
+[`resources/PhoneNumberMetadata.xml`](http://github.com/google/libphonenumber/blob/master/resources/PhoneNumberMetadata.xml).
 
 ## Validation and types of numbers
 
@@ -96,14 +96,14 @@
 
 To understand the behavior of functions, please refer to the documentation in
 the Javadoc/C++ header files. For example, see `isPossibleNumberWithReason` in
-[`PhoneNumberUtil`](https://github.com/googlei18n/libphonenumber/blob/master/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java).
+[`PhoneNumberUtil`](https://github.com/google/libphonenumber/blob/master/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java).
 
 ### Why does PhoneNumberUtil return false for valid short numbers?
 
 Short numbers are out of scope of
-[`PhoneNumberUtil`](https://github.com/googlei18n/libphonenumber/blob/master/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java).
+[`PhoneNumberUtil`](https://github.com/google/libphonenumber/blob/master/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java).
 For short numbers, use
-[`ShortNumberInfo`](https://github.com/googlei18n/libphonenumber/blob/master/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberInfo.java).
+[`ShortNumberInfo`](https://github.com/google/libphonenumber/blob/master/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberInfo.java).
 
 ### What does it mean for a phone number to be valid?
 
@@ -180,7 +180,7 @@
 
 ### What is mobile number portability?
 
-The ability to keep your mobile phone number when changing carriers. To see whether a region supports mobile number portability use [isMobileNumberPortableRegion](https://github.com/googlei18n/libphonenumber/blob/58247207903f917839001bc62525a5b48a475b7e/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java#L3524).
+The ability to keep your mobile phone number when changing carriers. To see whether a region supports mobile number portability use [isMobileNumberPortableRegion](https://github.com/google/libphonenumber/blob/58247207903f917839001bc62525a5b48a475b7e/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java#L3524).
 
 ### Since it's possible to change the carrier for a phone number, how is the data kept up-to-date?
 
@@ -281,7 +281,7 @@
 in areas that have had more area code splits. However, the usage of
 parentheses persists and both methods are acceptable.
 
-See [issue #1996](https://github.com/googlei18n/libphonenumber/issues/1996)
+See [issue #1996](https://github.com/google/libphonenumber/issues/1996)
 for some additional discussion.
 
 ### Why does formatNumberForMobileDialing return an empty string for my number?
@@ -458,20 +458,20 @@
 The metadata binary files can be generated using the ant build rules
 `build-phone-metadata` and `build-short-metadata` with `lite-build` set to
 `true`. This can be set in the [build
-file](https://github.com/googlei18n/libphonenumber/blob/master/java/build.xml)
+file](https://github.com/google/libphonenumber/blob/master/java/build.xml)
 itself.
 
 ### Which versions of the Maven jars should I use?
 
 When possible, use the [latest
-version](https://github.com/googlei18n/libphonenumber/releases) of
+version](https://github.com/google/libphonenumber/releases) of
 libphonenumber.
 
 For the other Maven artifacts, to find the version corresponding to a given
 version of libphonenumber, follow these steps:
 
 *   Go to the versioned GitHub tag, e.g.
-    https://github.com/googlei18n/libphonenumber/find/v8.3.3
+    https://github.com/google/libphonenumber/find/v8.3.3
 *   Type `pom.xml`. This will surface all the `pom.xml` files as they were
     released at the chosen tag.
 *   Find the version you care about in the corresponding `pom.xml` file. Look
@@ -496,14 +496,14 @@
 [Android developer
 guide](http://developer.android.com/guide/components/processes-and-threads.html),
 and will prevent the issue reported in
-[#265](https://github.com/googlei18n/libphonenumber/issues/265),
-[#528](https://github.com/googlei18n/libphonenumber/issues/528), and
-[#819](https://github.com/googlei18n/libphonenumber/issues/819).
+[#265](https://github.com/google/libphonenumber/issues/265),
+[#528](https://github.com/google/libphonenumber/issues/528), and
+[#819](https://github.com/google/libphonenumber/issues/819).
 
 #### Optimize loads
 
 You can manage your own resources by supplying your own
-[`MetadataLoader`](http://github.com/googlei18n/libphonenumber/blob/master/java/libphonenumber/src/com/google/i18n/phonenumbers/MetadataLoader.java)
+[`MetadataLoader`](http://github.com/google/libphonenumber/blob/master/java/libphonenumber/src/com/google/i18n/phonenumbers/MetadataLoader.java)
 implementation to the `PhoneNumberUtil` instance. It is thus possible for your
 app to load the resources as Android assets, while libphonenumber loads Java
 resources by default. The result is that the files are read as native Android assets
@@ -534,14 +534,14 @@
 email the [discussion
 group](https://groups.google.com/group/libphonenumber-discuss):
 
-*   [#1000](https://github.com/googlei18n/libphonenumber/issues/1000) to provide
+*   [#1000](https://github.com/google/libphonenumber/issues/1000) to provide
     a Windows DLL.
-*   [#1010](https://github.com/googlei18n/libphonenumber/issues/1010) to require
+*   [#1010](https://github.com/google/libphonenumber/issues/1010) to require
     Visual Studio 2015 update 2 or later on Windows
-*   PR [#1090](https://github.com/googlei18n/libphonenumber/pull/1090) /
-    [#824](https://github.com/googlei18n/libphonenumber/issues/824) to "Replace
+*   PR [#1090](https://github.com/google/libphonenumber/pull/1090) /
+    [#824](https://github.com/google/libphonenumber/issues/824) to "Replace
     POSIX directory operations by Boost Filesystem"
-*   [#1555](https://github.com/googlei18n/libphonenumber/issues/1555) to allow
+*   [#1555](https://github.com/google/libphonenumber/issues/1555) to allow
     Windows to build cpp library with pthreads for multi-threading
 
 ### How to remove a specific example number?
diff --git a/README.md b/README.md
index 40b111f..29ad186 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p align="right">
-<img src="https://travis-ci.org/googlei18n/libphonenumber.svg?branch=master">
+<img src="https://travis-ci.org/google/libphonenumber.svg?branch=master">
 </p>
 
 # What is it?
@@ -16,7 +16,7 @@
 *   Check the [frequently asked questions](FAQ.md)
 *   Fun! [Falsehoods Programmers Believe About Phone Numbers](FALSEHOODS.md)
 *   Look for
-    [`README`s](https://github.com/googlei18n/libphonenumber/find/master) in
+    [`README`s](https://github.com/google/libphonenumber/find/master) in
     directories relevant to the code you're interested in.
 *   For contributors and porters: [How to run the Java demo](run-java-demo.md)
 *   For porters: [How to make metadata changes](making-metadata-changes.md)
@@ -58,19 +58,19 @@
 Last demo update: v8.10.15.
 
 If this number is lower than the [latest release's version
-number](https://github.com/googlei18n/libphonenumber/releases), we are between
+number](https://github.com/google/libphonenumber/releases), we are between
 releases and the demo may be at either version.
 
 ## JavaScript
 
 The [JavaScript
-demo](https://rawgit.com/googlei18n/libphonenumber/master/javascript/i18n/phonenumbers/demo-compiled.html)
+demo](https://rawgit.com/google/libphonenumber/master/javascript/i18n/phonenumbers/demo-compiled.html)
 may be run at various tags; this link will take you to `master`.
 
 # Java code
 
 To include the Java code in your application, either integrate with Maven (see
-[wiki](https://github.com/googlei18n/libphonenumber/wiki)) or download the latest
+[wiki](https://github.com/google/libphonenumber/wiki)) or download the latest
 jars from the [Maven
 repository](https://repo1.maven.org/maven2/com/googlecode/libphonenumber/libphonenumber/).
 
@@ -108,9 +108,9 @@
 
 Want to get notified of new releases? During most of the year, excepting
 holidays and extenuating circumstances, we release fortnightly. We update
-[release tags](https://github.com/googlei18n/libphonenumber/releases) and
+[release tags](https://github.com/google/libphonenumber/releases) and
 document detailed [release notes](
-https://github.com/googlei18n/libphonenumber/blob/master/release_notes.txt).
+https://github.com/google/libphonenumber/blob/master/release_notes.txt).
 We also send an announcement to [libphonenumber-discuss](
 https://groups.google.com/forum/#!forum/libphonenumber-discuss) for every
 release.
@@ -206,7 +206,7 @@
 ```
 
 More examples on how to use the library can be found in the [unit
-tests](https://github.com/googlei18n/libphonenumber/tree/master/java/libphonenumber/test/com/google/i18n/phonenumbers).
+tests](https://github.com/google/libphonenumber/tree/master/java/libphonenumber/test/com/google/i18n/phonenumbers).
 
 # Third-party Ports
 
@@ -233,7 +233,7 @@
     `Class#getResourcesAsStream` and asks that Android apps follow the Android
     loading best practices of repackaging the metadata and loading from
     `AssetManager#open()` themselves
-    ([FAQ](https://github.com/googlei18n/libphonenumber/blob/master/FAQ.md#optimize-loads)).
+    ([FAQ](https://github.com/google/libphonenumber/blob/master/FAQ.md#optimize-loads)).
     If you don't want to do this, check out the port at
     https://github.com/MichaelRocks/libphonenumber-android, which does repackage
     the metadata and use `AssetManager#open()`, and may be depended on without
diff --git a/codereview.settings b/codereview.settings
index d4e57ae..72016b7 100644
--- a/codereview.settings
+++ b/codereview.settings
@@ -1,4 +1,4 @@
 # This file is used by gcl to get repository specific information.
 CODE_REVIEW_SERVER: codereview.appspot.com
 TRY_ON_UPLOAD: False
-VIEW_VC: https://github.com/googlei18n/libphonenumber/commit/
+VIEW_VC: https://github.com/google/libphonenumber/commit/
diff --git a/cpp/README b/cpp/README
index a19ec78..8ff6db8 100644
--- a/cpp/README
+++ b/cpp/README
@@ -160,7 +160,7 @@
 Get the libphonenumber source. For example:
   $ mkdir ~/libphonenumber_clone
   $ cd ~/libphonenumber_clone
-  $ git clone https://github.com/googlei18n/libphonenumber.git
+  $ git clone https://github.com/google/libphonenumber.git
 
 Build and test the library:
   $ cd libphonenumber/cpp
diff --git a/cpp/test/phonenumbers/asyoutypeformatter_test.cc b/cpp/test/phonenumbers/asyoutypeformatter_test.cc
index 4b3886c..bdd7f4e 100644
--- a/cpp/test/phonenumbers/asyoutypeformatter_test.cc
+++ b/cpp/test/phonenumbers/asyoutypeformatter_test.cc
@@ -94,7 +94,7 @@
 }
 
 TEST_F(AsYouTypeFormatterTest, TooLongNumberMatchingMultipleLeadingDigits) {
-  // See https://github.com/googlei18n/libphonenumber/issues/36
+  // See https://github.com/google/libphonenumber/issues/36
   // The bug occurred last time for countries which have two formatting rules
   // with exactly the same leading digits pattern but differ in length.
   formatter_.reset(phone_util_.GetAsYouTypeFormatter(RegionCode::GetUnknown()));
@@ -1226,7 +1226,7 @@
   // leading digit patterns; when we try again to extract a country code we
   // should ensure we use the last leading digit pattern, rather than the first
   // one such that it *thinks* it's found a valid formatting rule again.
-  // https://github.com/googlei18n/libphonenumber/issues/437
+  // https://github.com/google/libphonenumber/issues/437
   EXPECT_EQ("+8698812", formatter_->InputDigit('2', &result_));
   EXPECT_EQ("+86988123", formatter_->InputDigit('3', &result_));
   EXPECT_EQ("+869881234", formatter_->InputDigit('4', &result_));
diff --git a/debian/control b/debian/control
index fedf98c..a8fadbb 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@
                libservlet2.5-java-doc
 Standards-Version: 3.9.6
 Section: libs
-Homepage: https://github.com/googlei18n/libphonenumber/
+Homepage: https://github.com/google/libphonenumber/
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/libphonenumber.git/
 Vcs-Git: git://anonscm.debian.org/collab-maint/libphonenumber.git
 
diff --git a/debian/copyright b/debian/copyright
index 1995879..d95c238 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: libphonenumber
 Upstream-Contact: Fredrik Roubert <roubert@google.com>
-Source: https://github.com/googlei18n/libphonenumber/
+Source: https://github.com/google/libphonenumber/
 
 Files: * cpp/src/phonenumbers/base/logging.h
  cpp/src/phonenumbers/base/thread_checker.h
diff --git a/debian/watch b/debian/watch
index 9302262..0e9fac9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-https://github.com/googlei18n/libphonenumber/tags \
+https://github.com/google/libphonenumber/tags \
   .*/archive/libphonenumber-(\d[\d\.]+)\.tar\.gz
diff --git a/java/carrier/pom.xml b/java/carrier/pom.xml
index c8c8c49..df527de 100644
--- a/java/carrier/pom.xml
+++ b/java/carrier/pom.xml
@@ -5,7 +5,7 @@
   <artifactId>carrier</artifactId>
   <version>1.112-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <url>https://github.com/googlei18n/libphonenumber/</url>
+  <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
diff --git a/java/demo/pom.xml b/java/demo/pom.xml
index 5143a78..4ee1f6b 100644
--- a/java/demo/pom.xml
+++ b/java/demo/pom.xml
@@ -5,7 +5,7 @@
   <artifactId>demo</artifactId>
   <version>8.10.16-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <url>https://github.com/googlei18n/libphonenumber/</url>
+  <url>https://github.com/google/libphonenumber/</url>
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
diff --git a/java/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java b/java/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java
index de4606a..9dd9105 100644
--- a/java/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java
+++ b/java/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java
@@ -402,7 +402,7 @@
 
       String newIssueLink = getNewIssueLink(phoneNumber, defaultCountry, geocodingLocale);
       String guidelinesLink =
-          "https://github.com/googlei18n/libphonenumber/blob/master/CONTRIBUTING.md";
+          "https://github.com/google/libphonenumber/blob/master/CONTRIBUTING.md";
       output.append("<b style=\"color:red\">File an issue</b>: by clicking on "
           + "<a target=\"_blank\" href=\"" + newIssueLink + "\">this link</a>, I confirm that I "
           + "have read the <a target=\"_blank\" href=\"" + guidelinesLink
diff --git a/java/demo/war/phonenumberparser.jsp b/java/demo/war/phonenumberparser.jsp
index 8c9cc20..4e7b7f2 100644
--- a/java/demo/war/phonenumberparser.jsp
+++ b/java/demo/war/phonenumberparser.jsp
@@ -33,7 +33,7 @@
       <input type="submit" value="Submit">
       <input type="reset" value="Reset">
       <p></p>
-      <a href="https://github.com/googlei18n/libphonenumber/">Back to libphonenumber</a>
+      <a href="https://github.com/google/libphonenumber/">Back to libphonenumber</a>
     </form>
   </body>
 </html>
diff --git a/java/geocoder/pom.xml b/java/geocoder/pom.xml
index a1ddf73..7a697d8 100644
--- a/java/geocoder/pom.xml
+++ b/java/geocoder/pom.xml
@@ -5,7 +5,7 @@
   <artifactId>geocoder</artifactId>
   <version>2.122-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <url>https://github.com/googlei18n/libphonenumber/</url>
+  <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
diff --git a/java/internal/prefixmapper/pom.xml b/java/internal/prefixmapper/pom.xml
index fbb17e5..29dee05 100644
--- a/java/internal/prefixmapper/pom.xml
+++ b/java/internal/prefixmapper/pom.xml
@@ -5,7 +5,7 @@
   <artifactId>prefixmapper</artifactId>
   <version>2.122-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <url>https://github.com/googlei18n/libphonenumber/</url>
+  <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
diff --git a/java/libphonenumber/pom.xml b/java/libphonenumber/pom.xml
index b0e5ca7..4203c6e 100644
--- a/java/libphonenumber/pom.xml
+++ b/java/libphonenumber/pom.xml
@@ -5,7 +5,7 @@
   <artifactId>libphonenumber</artifactId>
   <version>8.10.16-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <url>https://github.com/googlei18n/libphonenumber/</url>
+  <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
index 75977a0..09a8a40 100644
--- a/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
+++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
@@ -66,7 +66,7 @@
   }
 
   public void testTooLongNumberMatchingMultipleLeadingDigits() {
-    // See https://github.com/googlei18n/libphonenumber/issues/36
+    // See https://github.com/google/libphonenumber/issues/36
     // The bug occurred last time for countries which have two formatting rules with exactly the
     // same leading digits pattern but differ in length.
     AsYouTypeFormatter formatter = phoneUtil.getAsYouTypeFormatter(RegionCode.ZZ);
@@ -1164,7 +1164,7 @@
     // when we try again to extract a country code we should ensure we use the last leading digit
     // pattern, rather than the first one such that it *thinks* it's found a valid formatting rule
     // again.
-    // https://github.com/googlei18n/libphonenumber/issues/437
+    // https://github.com/google/libphonenumber/issues/437
     assertEquals("+8698812", formatter.inputDigit('2'));
     assertEquals("+86988123", formatter.inputDigit('3'));
     assertEquals("+869881234", formatter.inputDigit('4'));
diff --git a/java/pom.xml b/java/pom.xml
index f56e059..a93b587 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -5,7 +5,7 @@
   <artifactId>libphonenumber-parent</artifactId>
   <version>8.10.16-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <url>https://github.com/googlei18n/libphonenumber/</url>
+  <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>org.sonatype.oss</groupId>
@@ -31,9 +31,9 @@
   </licenses>
 
   <scm>
-    <connection>scm:git:https://github.com/googlei18n/libphonenumber.git</connection>
+    <connection>scm:git:https://github.com/google/libphonenumber.git</connection>
     <developerConnection>scm:git:git@github.com:googlei18n/libphonenumber.git</developerConnection>
-    <url>https://github.com/googlei18n/libphonenumber/</url>
+    <url>https://github.com/google/libphonenumber/</url>
     <tag>HEAD</tag>
   </scm>
 
diff --git a/javascript/README.md b/javascript/README.md
index 9724d8f..c1f7efe 100644
--- a/javascript/README.md
+++ b/javascript/README.md
@@ -8,7 +8,7 @@
 =============
 1.  Checkout closure-library, closure-compiler, closure-linter and python-gflags next to libphonenumber:
 
-* `git clone https://github.com/googlei18n/libphonenumber/`
+* `git clone https://github.com/google/libphonenumber/`
 
 * `git clone https://github.com/google/closure-library/`
 
diff --git a/javascript/i18n/phonenumbers/asyoutypeformatter_test.js b/javascript/i18n/phonenumbers/asyoutypeformatter_test.js
index 1b70b28..14531b5 100644
--- a/javascript/i18n/phonenumbers/asyoutypeformatter_test.js
+++ b/javascript/i18n/phonenumbers/asyoutypeformatter_test.js
@@ -73,7 +73,7 @@
 }
 
 function testTooLongNumberMatchingMultipleLeadingDigits() {
-  // See https://github.com/googlei18n/libphonenumber/issues/36
+  // See https://github.com/google/libphonenumber/issues/36
   // The bug occurred last time for countries which have two formatting rules
   // with exactly the same leading digits pattern but differ in length.
   /** @type {i18n.phonenumbers.AsYouTypeFormatter} */
@@ -1199,7 +1199,7 @@
   // leading digit patterns; when we try again to extract a country code we
   // should ensure we use the last leading digit pattern, rather than the first
   // one such that it *thinks* it's found a valid formatting rule again.
-  // https://github.com/googlei18n/libphonenumber/issues/437
+  // https://github.com/google/libphonenumber/issues/437
   assertEquals('+8698812', f.inputDigit('2'));
   assertEquals('+86988123', f.inputDigit('3'));
   assertEquals('+869881234', f.inputDigit('4'));
diff --git a/making-metadata-changes.md b/making-metadata-changes.md
index 8319b5e..0cca53a 100644
--- a/making-metadata-changes.md
+++ b/making-metadata-changes.md
@@ -63,7 +63,7 @@
 #### C++
 
 See the [C++
-README](http://github.com/googlei18n/libphonenumber/blob/master/cpp/README)
+README](http://github.com/google/libphonenumber/blob/master/cpp/README)
 instructions for how to build and run C++. You should build it with
 `USE_LITE_METADATA` set to `ON` as well as `OFF`, which will generate both a
 `metadata.cc` and a `metadata_lite.cc` file.
diff --git a/release_notes.txt b/release_notes.txt
index e7e7e3d..7261564 100644
--- a/release_notes.txt
+++ b/release_notes.txt
@@ -1708,7 +1708,7 @@
  - Adds isNumberGeographical() method.
  - Adds getRegionCodesForCountryCode() method.
  - Fixing issue with getSupportedGlobalNetworkCallingCodes()
-   [https://github.com/googlei18n/libphonenumber/issues/202]
+   [https://github.com/google/libphonenumber/issues/202]
  - Ensures that returned collections are unmodifiable where necessary
    [there is a very slight risk that this may break existing users who were relying on being able
    to modify these collections, but doing so would be breaking lots of other assumptions that this
diff --git a/resources/timezones/README.md b/resources/timezones/README.md
index 1f67afd..68ea25d 100644
--- a/resources/timezones/README.md
+++ b/resources/timezones/README.md
@@ -10,7 +10,7 @@
 number.
 
 Code Location:
-[java/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java](https://github.com/googlei18n/libphonenumber/blob/master/java/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java)
+[java/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java](https://github.com/google/libphonenumber/blob/master/java/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java)
 
 Example usage:
 
diff --git a/run-java-demo.md b/run-java-demo.md
index 47ad115..156c223 100644
--- a/run-java-demo.md
+++ b/run-java-demo.md
@@ -23,7 +23,7 @@
 Check out the Java code:
 
 ```
-git clone https://github.com/googlei18n/libphonenumber.git
+git clone https://github.com/google/libphonenumber.git
 ```
 
 Create a symlink to your unpacked appengine sdk directory at the same level as
diff --git a/tools/java/common/src/com/google/i18n/phonenumbers/MetadataFilter.java b/tools/java/common/src/com/google/i18n/phonenumbers/MetadataFilter.java
index 0cae693..e9ca75a 100644
--- a/tools/java/common/src/com/google/i18n/phonenumbers/MetadataFilter.java
+++ b/tools/java/common/src/com/google/i18n/phonenumbers/MetadataFilter.java
@@ -86,7 +86,7 @@
 
   // Note: If changing the blacklist here or the name of the method, update documentation about
   // affected methods at the same time:
-  // https://github.com/googlei18n/libphonenumber/blob/master/FAQ.md#what-is-the-metadatalitejsmetadata_lite-option
+  // https://github.com/google/libphonenumber/blob/master/FAQ.md#what-is-the-metadatalitejsmetadata_lite-option
   static MetadataFilter forLiteBuild() {
     // "exampleNumber" is a blacklist.
     return new MetadataFilter(parseFieldMapFromString("exampleNumber"));
diff --git a/tools/java/data/webapp/index.html b/tools/java/data/webapp/index.html
index ea51079..5916f54 100644
--- a/tools/java/data/webapp/index.html
+++ b/tools/java/data/webapp/index.html
@@ -15,7 +15,7 @@
 
       <textarea name="geodata" rows="20" cols="80"></textarea>
       <input type="submit" value="Submit"><br>
-      <a href="https://github.com/googlei18n/libphonenumber/">Back to libphonenumber</a>
+      <a href="https://github.com/google/libphonenumber/">Back to libphonenumber</a>
     </form>
   </body>