diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 147239ce..7f697fd2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1 +1 @@
-See the [Ignition Robotics contributing guide](https://ignitionrobotics.org/docs/all/contributing).
+See the [Ignition Robotics contributing guide](https://gazebosim.org/docs/all/contributing).
diff --git a/Changelog.md b/Changelog.md
index 327a8930..e1c0fedb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -22,88 +22,88 @@
 1. Remove unused files (bitbucket-pipelines, docs)
     * [Pull request #273](https://github.com/gazebosim/gz-fuel-tools/pull/273)
 
-1. Disable `staging-fuel.ignitionrobotics.org` test
+1. Disable `staging-fuel.gazebosim.org` test
     * [Pull request #257](https://github.com/gazebosim/gz-fuel-tools/pull/257)
 
 ### Ignition Fuel Tools 4.5.0 (2022-06-01)
 
 1. APIs for retrieving models in parallel
-    * [Pull request #199](https://github.com/ignitionrobotics/ign-fuel-tools/pull/199)
+    * [Pull request #199](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/199)
 
 1. Add missing header guard for Interface.hh
-    * [Pull request #249](https://github.com/ignitionrobotics/ign-fuel-tools/pull/249)
+    * [Pull request #249](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/249)
 
 1. Print error when unzipping fails to save a file
-    * [Pull request #235](https://github.com/ignitionrobotics/ign-fuel-tools/pull/235)
+    * [Pull request #235](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/235)
 
 1. More checks when manipulating file system in tests
-    * [Pull request #227](https://github.com/ignitionrobotics/ign-fuel-tools/pull/227)
+    * [Pull request #227](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/227)
 
 1. Move test cache to build folder
-    * [Pull request #222](https://github.com/ignitionrobotics/ign-fuel-tools/pull/222)
+    * [Pull request #222](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/222)
 
 1. Improve and fix `ResultType` tests
-    * [Pull request #225](https://github.com/ignitionrobotics/ign-fuel-tools/pull/225)
+    * [Pull request #225](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/225)
 
 1. FuelClient.cc: include <deque>
-    * [Pull request #213](https://github.com/ignitionrobotics/ign-fuel-tools/pull/213)
+    * [Pull request #213](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/213)
 
 ### Ignition Fuel Tools 4.4.0 (2021-06-17)
 
 1. Remove `tools/code_check` and update codecov
-    * [Pull request #187](https://github.com/ignitionrobotics/ign-fuel-tools/pull/187)
+    * [Pull request #187](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/187)
 
 1. Fixed windows download
-    * [Pull request #178](https://github.com/ignitionrobotics/ign-fuel-tools/pull/178)
+    * [Pull request #178](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/178)
 
 1. Master branch updates
-    * [Pull request #170](https://github.com/ignitionrobotics/ign-fuel-tools/pull/170)
+    * [Pull request #170](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/170)
 
 1. Support private-token in `config.yaml`
-    * [Pull request #156](https://github.com/ignitionrobotics/ign-fuel-tools/pull/156)
+    * [Pull request #156](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/156)
 
 1. Add Windows Installation
-    * [Pull request #162](https://github.com/ignitionrobotics/ign-fuel-tools/pull/162)
+    * [Pull request #162](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/162)
 
 1. Use semantic version and prevent crash if version is missing
-    * [Pull request #151](https://github.com/ignitionrobotics/ign-fuel-tools/pull/151)
+    * [Pull request #151](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/151)
 
 1. Document `IGN_FUEL_CACHE_PATH` on command line
-    * [Pull request #149](https://github.com/ignitionrobotics/ign-fuel-tools/pull/149)
+    * [Pull request #149](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/149)
 
 1. Support editing/patching model files
-    * [Pull request #140](https://github.com/ignitionrobotics/ign-fuel-tools/pull/140)
+    * [Pull request #140](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/140)
 
 1. Set keep alive on
-    * [Pull request #141](https://github.com/ignitionrobotics/ign-fuel-tools/pull/141)
+    * [Pull request #141](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/141)
 
 ### Ignition Fuel Tools 4.3.0 (2020-12-01)
 
 1. Improve fork experience.
-    * [Pull request 126](https://github.com/ignitionrobotics/ign-fuel-tools/pull/126)
+    * [Pull request 126](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/126)
 
 1. Download dependencies.
-    * [Pull request 123](https://github.com/ignitionrobotics/ign-fuel-tools/pull/123)
+    * [Pull request 123](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/123)
 
 1. Includes all changes up to version 3.5.0.
 
 ### Ignition Fuel Tools 4.2.1 (2020-08-26)
 
 1. Fix `ign fuel download`, which was missing the `-j` option.
-    * [Pull request 116](https://github.com/ignitionrobotics/ign-fuel-tools/pull/116)
+    * [Pull request 116](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/116)
 
 ### Ignition Fuel Tools 4.2.0 (2020-08-26)
 
 1. Set license information based on licenses available from a Fuel server
    and `legal` information in a `metadata.pbtxt` file.
-    * [Pull request 69](https://github.com/ignitionrobotics/ign-fuel-tools/pull/69)
+    * [Pull request 69](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/69)
 
 1. Added `edit` subcommand to the `ign fuel`. The edit command currently
    supports editing a model's privacy.
-    * [Pull request 67](https://github.com/ignitionrobotics/ign-fuel-tools/pull/67)
+    * [Pull request 67](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/67)
 
 1. Alphabetical listing of subcommands.
-    * [Pull request 65](https://github.com/ignitionrobotics/ign-fuel-tools/pull/65)
+    * [Pull request 65](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/65)
 
 1. All changes up to and including Ignition Fuel Tools 3.3.0 are included.
 
@@ -132,52 +132,52 @@
 ### Ignition Fuel Tools 3.5.0 (2020-11-30)
 
 1. Fix windows build.
-    * [Pull request 107](https://github.com/ignitionrobotics/ign-fuel-tools/pull/107)
+    * [Pull request 107](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/107)
 
 1. Resolve updated codecheck issues.
-    * [Pull request 129](https://github.com/ignitionrobotics/ign-fuel-tools/pull/129)
+    * [Pull request 129](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/129)
 
 1. Update Backpack model to fix tests.
-    * [Pull request 132](https://github.com/ignitionrobotics/ign-fuel-tools/pull/132)
+    * [Pull request 132](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/132)
 
 1. Use lowercase resource and owner names when storing assets on disk.
-    * [Pull request 130](https://github.com/ignitionrobotics/ign-fuel-tools/pull/130)
+    * [Pull request 130](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/130)
 
 ### Ignition Fuel Tools 3.4.0 (2020-08-19)
 
 1. Modernize github actions by updating to the new style.
-    * [Pull request 94](https://github.com/ignitionrobotics/ign-fuel-tools/pull/94)
+    * [Pull request 94](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/94)
 
 1. Fix test worlds.
-    * [Pull request 100](https://github.com/ignitionrobotics/ign-fuel-tools/pull/100)
+    * [Pull request 100](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/100)
 
 1. Add capability for downloading collections.
-    * [Pull request 98](https://github.com/ignitionrobotics/ign-fuel-tools/pull/98)
+    * [Pull request 98](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/98)
 
 1. Fix windows build.t
-    * [Pull request 103](https://github.com/ignitionrobotics/ign-fuel-tools/pull/013)
+    * [Pull request 103](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/013)
 
 ### Ignition Fuel Tools 3.3.0 (2020-07-29)
 
 1. openrobotics to OpenRobotics
-    * [Pull request 75](https://github.com/ignitionrobotics/ign-fuel-tools/pull/75)
+    * [Pull request 75](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/75)
 
 1. Fix world tests
-    * [Pull request 76](https://github.com/ignitionrobotics/ign-fuel-tools/pull/76)
+    * [Pull request 76](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/76)
 
 1. Add missing dependency in Actions CI
-    * [Pull request 86](https://github.com/ignitionrobotics/ign-fuel-tools/pull/86)
+    * [Pull request 86](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/86)
 
 1. Backport file fetching
-    * [Pull request 84](https://github.com/ignitionrobotics/ign-fuel-tools/pull/84)
+    * [Pull request 84](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/84)
 
 1. Convert model:// to Fuel URLs instead of absolute paths
-    * [Pull request 85](https://github.com/ignitionrobotics/ign-fuel-tools/pull/85)
+    * [Pull request 85](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/85)
 
 ### Ignition Fuel Tools 3.2.2 (2020-05-18)
 
 1. Fix URL encodings in RestClient.
-    * [Pull request 70](https://github.com/ignitionrobotics/ign-fuel-tools/pull/70)
+    * [Pull request 70](https://gazebosim.org/gazebosim/gz-fuel-tools/pull/70)
 
 1. Print message when downloading a resource.
     * [BitBucket pull request 102](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-fuel-tools/pull-requests/102)
diff --git a/Migration.md b/Migration.md
index 622d9dc6..9453ed14 100644
--- a/Migration.md
+++ b/Migration.md
@@ -1,5 +1,11 @@
 ## Ignition Fuel Tools 3.X to 4.X
 
+### Depercations
+
+1. The `fuel.gazebosim.org` Fuel server has been deprecated, and
+    redirects to `fuel.gazebosim.org`. Use `fuel.gazebosim.org` in all Fuel
+    URLs.
+
 ### Modifications
 
 1. `FuelClient::UploadModel` takes 2 more arguments now.
diff --git a/NEWS b/NEWS
index d4615e07..4c6923c5 100644
--- a/NEWS
+++ b/NEWS
@@ -1 +1 @@
-http://bitbucket.org/ignitionrobotics/ign-rndf
\ No newline at end of file
+https://gazebosim.org
diff --git a/README.md b/README.md
index 26d56adb..b731bafa 100644
--- a/README.md
+++ b/README.md
@@ -33,16 +33,16 @@ For a complete list of commands run `ign fuel -h` on the command line.
 ** List all models **
 ```
 $ ign fuel list -t model -r | head
-https://fuel.ignitionrobotics.org/anonymous/test_model_595389531
-https://fuel.ignitionrobotics.org/anonymous/test_model_122023392
-https://fuel.ignitionrobotics.org/anonymous/test_model_429486665
-https://fuel.ignitionrobotics.org/anonymous/test_model_887243621
-https://fuel.ignitionrobotics.org/anonymous/test_model_084900530
-https://fuel.ignitionrobotics.org/anonymous/test_model_240061059
-https://fuel.ignitionrobotics.org/anonymous/test_model_464734097
-https://fuel.ignitionrobotics.org/anonymous/test_model_658598990
-https://fuel.ignitionrobotics.org/anonymous/test_model_834617935
-https://fuel.ignitionrobotics.org/anonymous/test_model_380348669
+https://fuel.gazebosim.org/anonymous/test_model_595389531
+https://fuel.gazebosim.org/anonymous/test_model_122023392
+https://fuel.gazebosim.org/anonymous/test_model_429486665
+https://fuel.gazebosim.org/anonymous/test_model_887243621
+https://fuel.gazebosim.org/anonymous/test_model_084900530
+https://fuel.gazebosim.org/anonymous/test_model_240061059
+https://fuel.gazebosim.org/anonymous/test_model_464734097
+https://fuel.gazebosim.org/anonymous/test_model_658598990
+https://fuel.gazebosim.org/anonymous/test_model_834617935
+https://fuel.gazebosim.org/anonymous/test_model_380348669
 ```
 
 ** Download a model **
@@ -107,7 +107,7 @@ See issues beginning with [Fuel backend] in the title. Here are two examples.
 ** TODO: Find a model on disk **
 ```
 $ ign fuel locate --name am1
-/home/developer/.ignition/fuel/fuel.ignitionrobotics.org/alice/am1
+/home/developer/.ignition/fuel/fuel.gazebosim.org/alice/am1
 ```
 
 ## Dependencies
diff --git a/conf/config.yaml b/conf/config.yaml
index aed27fc4..75cfa7bf 100644
--- a/conf/config.yaml
+++ b/conf/config.yaml
@@ -3,7 +3,7 @@
 servers:
   -
     name: osrf
-    url: https://fuel.ignitionrobotics.org
+    url: https://fuel.gazebosim.org
 
   # -
     # name: another_server
diff --git a/example/download.cc b/example/download.cc
index 2cc75c04..c03074af 100644
--- a/example/download.cc
+++ b/example/download.cc
@@ -38,7 +38,7 @@ int main(int argc, char **argv)
   usage += " Usage:\n  ./download <options>\n\n";
   usage += "  Examples:\n"
     "\t ./download -t model -o OpenRobotics -n Beer\n"
-    "\t ./download -s https://fuel.ignitionrobotics.org -t world "
+    "\t ./download -s https://fuel.gazebosim.org -t world "
     "-o OpenRobotics"
     " -n Empty\n"
     "\t ./download -c /tmp/my_config.yaml -t model -o caguero -n Beer\n";
diff --git a/include/gz/fuel_tools/FuelClient.hh b/include/gz/fuel_tools/FuelClient.hh
index 07d7bd07..7a7dec15 100644
--- a/include/gz/fuel_tools/FuelClient.hh
+++ b/include/gz/fuel_tools/FuelClient.hh
@@ -184,7 +184,7 @@ namespace ignition
 
       /// \brief Remove a resource, such as a model or world, from Ignition Fuel
       /// \param[in] _uri The full URI of the resource, e.g:
-      /// https://fuel.ignitionrobotics.org/1.0/openrobotcs/model/my_model
+      /// https://fuel.gazebosim.org/1.0/openrobotcs/model/my_model
       /// \param[in] _headers Headers to set on the HTTP request.
       /// \return Result of the delete operation
       public: Result DeleteUrl(const gz::common::URI &_uri,
@@ -238,7 +238,7 @@ namespace ignition
       /// \brief Download a model from ignition fuel. This will override an
       /// existing local copy of the model.
       /// \param[in] _modelUrl The unique URL of the model to download.
-      /// E.g.: https://fuel.ignitionrobotics.org/1.0/caguero/models/Beer
+      /// E.g.: https://fuel.gazebosim.org/1.0/caguero/models/Beer
       /// \param[out] _path Path where the model was downloaded.
       /// \return Result of the download operation.
       public: Result DownloadModel(const common::URI &_modelUrl,
@@ -247,7 +247,7 @@ namespace ignition
       /// \brief Download a world from ignition fuel. This will override an
       /// existing local copy of the world.
       /// \param[in] _worldUrl The unique URL of the world to download.
-      /// E.g.: https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty
+      /// E.g.: https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty
       /// \param[out] _path Path where the world was downloaded.
       /// \return Result of the download operation.
       public: Result DownloadWorld(const common::URI &_worldUrl,
@@ -277,7 +277,7 @@ namespace ignition
 
       /// \brief Check if a model is already present in the local cache.
       /// \param[in] _modelUrl The unique URL of the model on a Fuel server.
-      /// E.g.: https://fuel.ignitionrobotics.org/1.0/caguero/models/Beer
+      /// E.g.: https://fuel.gazebosim.org/1.0/caguero/models/Beer
       /// \param[out] _path Local path where the model can be found.
       /// \return FETCH_ERROR if not cached, FETCH_ALREADY_EXISTS if cached.
       public: Result CachedModel(const common::URI &_modelUrl,
@@ -285,13 +285,13 @@ namespace ignition
 
       /// \brief Check if a model exists in the cache.
       /// \param[in] _modelUrl The unique URL of the world on a Fuel server.
-      /// E.g.: https://fuel.ignitionrobotics.org/1.0/caguero/models/Beer
+      /// E.g.: https://fuel.gazebosim.org/1.0/caguero/models/Beer
       /// \return True if the model exists in the cache, false otherwise.
       public: bool CachedModel(const common::URI &_modelUrl);
 
       /// \brief Check if a world is already present in the local cache.
       /// \param[in] _worldUrl The unique URL of the world on a Fuel server.
-      /// E.g.: https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty
+      /// E.g.: https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty
       /// \param[out] _path Local path where the world can be found.
       /// \return FETCH_ERROR if not cached, FETCH_ALREADY_EXISTS if cached.
       public: Result CachedWorld(const common::URI &_worldUrl,
@@ -299,7 +299,7 @@ namespace ignition
 
       /// \brief Check if a world exists in the cache.
       /// \param[in] _worldUrl The unique URL of the world on a Fuel server.
-      /// E.g.: https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty
+      /// E.g.: https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty
       /// \return True if the world exists in the cache, false otherwise.
       public: bool CachedWorld(const common::URI &_worldUrl);
 
diff --git a/src/ClientConfig.cc b/src/ClientConfig.cc
index a13eb8ed..081e6fd9 100644
--- a/src/ClientConfig.cc
+++ b/src/ClientConfig.cc
@@ -89,7 +89,7 @@ class gz::fuel_tools::ServerConfigPrivate
           }
 
   /// \brief URL to reach server
-  public: common::URI url{"https://fuel.ignitionrobotics.org"};
+  public: common::URI url{"https://fuel.gazebosim.org"};
 
   /// \brief A key to auth with the server
   public: std::string key = "";
diff --git a/src/ClientConfig_TEST.cc b/src/ClientConfig_TEST.cc
index bd420764..f649c3c3 100644
--- a/src/ClientConfig_TEST.cc
+++ b/src/ClientConfig_TEST.cc
@@ -30,7 +30,7 @@ using namespace fuel_tools;
 /////////////////////////////////////////////////
 /// \brief Helper to remove file according to OS, while Windows
 /// has this issue:
-/// https://github.com/ignitionrobotics/ign-common/issues/51
+/// https://github.com/gazebosim/gz-common/issues/51
 /// \todo(anyone) Remove this once Windows issue is solved.
 /// \param[in] _path Path to file to be removed.
 void removeFileTemp(const std::string &_path)
@@ -98,7 +98,7 @@ TEST(ClientConfig, CustomDefaultConfiguration)
 {
   ClientConfig config;
   ASSERT_EQ(2u, config.Servers().size());
-  EXPECT_EQ("https://fuel.ignitionrobotics.org",
+  EXPECT_EQ("https://fuel.gazebosim.org",
     config.Servers().front().Url().Str());
   EXPECT_EQ("https://fuel.gazebosim.org",
     config.Servers()[1].Url().Str());
@@ -137,7 +137,7 @@ TEST(ClientConfig, CustomConfiguration)
   EXPECT_TRUE(config.LoadConfig(testPath));
 
   ASSERT_EQ(4u, config.Servers().size());
-  EXPECT_EQ("https://fuel.ignitionrobotics.org",
+  EXPECT_EQ("https://fuel.gazebosim.org",
     config.Servers().front().Url().Str());
   EXPECT_EQ("https://fuel.gazebosim.org",
     config.Servers()[1].Url().Str());
@@ -166,10 +166,10 @@ TEST(ClientConfig, RepeatedServerConfiguration)
       << "# The list of servers."                 << std::endl
       << "servers:"                               << std::endl
       << "  -"                                    << std::endl
-      << "    url: https://fuel.ignitionrobotics.org"  << std::endl
+      << "    url: https://fuel.gazebosim.org"  << std::endl
       << ""                                       << std::endl
       << "  -"                                    << std::endl
-      << "    url: https://fuel.ignitionrobotics.org"  << std::endl
+      << "    url: https://fuel.gazebosim.org"  << std::endl
       << ""                                       << std::endl
       << "# Where are the assets stored in disk." << std::endl
       << "cache:"                                 << std::endl
@@ -317,7 +317,7 @@ TEST(ClientConfig, AsString)
 #else
     EXPECT_NE(str.find(".ignition\\fuel"), std::string::npos);
 #endif
-    EXPECT_NE(str.find("https://fuel.ignitionrobotics.org"), std::string::npos);
+    EXPECT_NE(str.find("https://fuel.gazebosim.org"), std::string::npos);
   }
 
   {
diff --git a/src/CollectionIdentifier_TEST.cc b/src/CollectionIdentifier_TEST.cc
index a8daa2f5..a4e3e39c 100644
--- a/src/CollectionIdentifier_TEST.cc
+++ b/src/CollectionIdentifier_TEST.cc
@@ -123,18 +123,18 @@ TEST(CollectionIdentifier, AsString)
     std::string str =
         "Name: \n"\
         "Owner: \n"\
-        "Unique name: https://fuel.ignitionrobotics.org/collections/\n"
+        "Unique name: https://fuel.gazebosim.org/collections/\n"
         "Server:\n"
-        "  URL: https://fuel.ignitionrobotics.org\n"
+        "  URL: https://fuel.gazebosim.org\n"
         "  Version: 1.0\n"
         "  API key: \n";
 #else
     std::string str =
         "Name: \n"\
         "Owner: \n"\
-        "Unique name: https://fuel.ignitionrobotics.org/collections\n"
+        "Unique name: https://fuel.gazebosim.org/collections\n"
         "Server:\n"
-        "  URL: https://fuel.ignitionrobotics.org\n"
+        "  URL: https://fuel.gazebosim.org\n"
         "  Version: 1.0\n"
         "  API key: \n";
 #endif
@@ -161,7 +161,7 @@ TEST(CollectionIdentifier, AsPrettyString)
     CollectionIdentifier id;
     std::string str =
       "\x1B[96m\x1B[1mServer:\x1B[0m\n  "
-      "\x1B[96m\x1B[1mURL: \x1B[0m\x1B[37mhttps://fuel.ignitionrobotics.org"
+      "\x1B[96m\x1B[1mURL: \x1B[0m\x1B[37mhttps://fuel.gazebosim.org"
       "\x1B[0m\n  \x1B[96m\x1B[1mVersion: \x1B[0m\x1B[37m1.0\x1B[0m\n";
     EXPECT_EQ(str, id.AsPrettyString());
   }
diff --git a/src/FuelClient.cc b/src/FuelClient.cc
index 391a0250..fe8150a6 100644
--- a/src/FuelClient.cc
+++ b/src/FuelClient.cc
@@ -56,7 +56,7 @@ using namespace fuel_tools;
 class gz::fuel_tools::FuelClientPrivate
 {
   /// \brief A model URL,
-  /// E.g.: https://fuel.ignitionrobotics.org/1.0/caguero/models/Beer/2
+  /// E.g.: https://fuel.gazebosim.org/1.0/caguero/models/Beer/2
   /// Where the API version and the model version are optional.
   public: const std::string kModelUrlRegexStr{
     // Method
@@ -75,7 +75,7 @@ class gz::fuel_tools::FuelClientPrivate
     "([0-9]*|tip)"};
 
   /// \brief A world URL,
-  /// E.g.: https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Empty/1
+  /// E.g.: https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Empty/1
   /// Where the API version and the world version are optional.
   public: const std::string kWorldUrlRegexStr{
     // Method
@@ -141,7 +141,7 @@ class gz::fuel_tools::FuelClientPrivate
 
   /// \brief A collection URL,
   /// E.g.:
-  /// https://fuel.ignitionrobotics.org/1.0/OpenRobotics/collections/TestColl
+  /// https://fuel.gazebosim.org/1.0/OpenRobotics/collections/TestColl
   /// Where the API version is optional
   public: const std::string kCollectionUrlRegexStr{
     // Method
@@ -186,6 +186,12 @@ class gz::fuel_tools::FuelClientPrivate
   /// license information.
   public: void PopulateLicenses(const ServerConfig &_server);
 
+  /// \brief Checks the provided URI for fuel.gazebosim.org, and
+  /// prints a deprecation warning message if found.
+  /// \param[in] _uri URI to check
+  /// DEPRECATED/DEPRECATION: remove this function in Gazebo H.
+  public: void CheckForDeprecatedUri(const common::URI &_uri);
+
   /// \brief Client configuration
   public: ClientConfig config;
 
@@ -497,6 +503,8 @@ void FuelClient::AddServerConfigParametersToHeaders(
 Result FuelClient::DeleteUrl(const gz::common::URI &_uri,
     const std::vector<std::string> &_headers)
 {
+  this->dataPtr->CheckForDeprecatedUri(_uri);
+
   Rest rest;
   RestResponse resp;
 
@@ -599,6 +607,7 @@ Result FuelClient::DownloadModel(const ModelIdentifier &_id,
           << std::endl << _id.Server().AsString() << std::endl;
     return Result(ResultType::FETCH_ERROR);
   }
+  this->dataPtr->CheckForDeprecatedUri(_id.Server().Url());
 
   // Route
   common::URIPath route;
@@ -766,6 +775,8 @@ Result FuelClient::DownloadWorld(WorldIdentifier &_id)
     return Result(ResultType::FETCH_ERROR);
   }
 
+  this->dataPtr->CheckForDeprecatedUri(_id.Server().Url());
+
   // Route
   common::URIPath route;
   route = route / _id.Owner() / "worlds" / _id.Name() / _id.VersionStr() /
@@ -1135,6 +1146,8 @@ bool FuelClient::ParseModelFileUrl(const common::URI &_fileUrl,
   if (!_fileUrl.Valid())
     return false;
 
+  this->dataPtr->CheckForDeprecatedUri(_fileUrl);
+
   auto urlStr = _fileUrl.Str();
 
   std::smatch match;
@@ -1776,3 +1789,18 @@ void FuelClientPrivate::PopulateLicenses(const ServerConfig &_server)
     ignerr << "Failed to parse license information[" << resp.data << "]\n";
   }
 }
+
+//////////////////////////////////////////////////
+void FuelClientPrivate::CheckForDeprecatedUri(const common::URI &_uri)
+{
+  static std::string oldServer = "fuel.ignitionrobotics.org";
+  auto ignFuelPos = _uri.Str().find(oldServer);
+  if (ignFuelPos != std::string::npos)
+  {
+    std::string newUrl = _uri.Str();
+    newUrl.replace(ignFuelPos, oldServer.size(), "fuel.gazebosim.org");
+    ignwarn << "The " << oldServer << " URL is deprecrated. Please change "
+      << _uri.Str() << " to " << newUrl << std::endl;
+  }
+}
+
diff --git a/src/Interface_TEST.cc b/src/Interface_TEST.cc
index fd0e81c6..db8e5d3b 100644
--- a/src/Interface_TEST.cc
+++ b/src/Interface_TEST.cc
@@ -38,7 +38,7 @@ using namespace ignition::fuel_tools;
 
 /////////////////////////////////////////////////
 // Protocol "https" not supported or disabled in libcurl for Windows
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105
+// https://github.com/gazebosim/gz-fuel-tools/issues/105
 TEST(Interface, FetchResources)
 {
   common::Console::SetVerbosity(4);
@@ -60,7 +60,7 @@ TEST(Interface, FetchResources)
   {
     // Check it's not cached
     common::URI modelUrl{
-      "https://fuel.ignitionrobotics.org/1.0/chapulina/models/Test box"};
+      "https://fuel.gazebosim.org/1.0/chapulina/models/Test box"};
     {
       Result res = client.CachedModel(modelUrl, cachedPath);
       EXPECT_FALSE(res) << "Cached Path: " << cachedPath;
@@ -72,20 +72,20 @@ TEST(Interface, FetchResources)
 
     // Check it was downloaded to `2`
     EXPECT_EQ(path, common::joinPaths(common::cwd(), "test_cache",
-      "fuel.ignitionrobotics.org", "chapulina", "models", "test box", "2"));
+      "fuel.gazebosim.org", "chapulina", "models", "test box", "2"));
     EXPECT_TRUE(common::exists(
-        common::joinPaths("test_cache", "fuel.ignitionrobotics.org",
+        common::joinPaths("test_cache", "fuel.gazebosim.org",
           "chapulina", "models", "test box", "2")));
     EXPECT_TRUE(common::exists(
-        common::joinPaths("test_cache", "fuel.ignitionrobotics.org",
+        common::joinPaths("test_cache", "fuel.gazebosim.org",
           "chapulina", "models", "test box", "2", "model.sdf")));
     EXPECT_TRUE(common::exists(
-        common::joinPaths("test_cache", "fuel.ignitionrobotics.org",
+        common::joinPaths("test_cache", "fuel.gazebosim.org",
           "chapulina", "models", "test box", "2", "model.config")));
 
     // Check it wasn't downloaded to model root directory
     EXPECT_FALSE(common::exists(
-        common::joinPaths("test_cache", "fuel.ignitionrobotics.org",
+        common::joinPaths("test_cache", "fuel.gazebosim.org",
           "chapulina", "models", "Test box", "model.config")));
 
     // Check it is cached
@@ -94,7 +94,7 @@ TEST(Interface, FetchResources)
       EXPECT_TRUE(res);
       EXPECT_EQ(ResultType::FETCH_ALREADY_EXISTS, res.Type());
       EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache",
-        "fuel.ignitionrobotics.org", "chapulina", "models", "test box", "2"),
+        "fuel.gazebosim.org", "chapulina", "models", "test box", "2"),
         cachedPath);
      }
   }
@@ -103,9 +103,9 @@ TEST(Interface, FetchResources)
   {
     // Check neither file nor its model are cached
     common::URI modelUrl{
-      "https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Bus/1/"};
+      "https://fuel.gazebosim.org/1.0/openrobotics/models/Bus/1/"};
     common::URI modelFileUrl{
-      "https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Bus/1/files"
+      "https://fuel.gazebosim.org/1.0/openrobotics/models/Bus/1/files"
       "/meshes/bus.obj"};
 
     {
@@ -124,25 +124,25 @@ TEST(Interface, FetchResources)
 
     // Check entire model was downloaded to `1`
     EXPECT_TRUE(common::exists(
-        common::joinPaths("test_cache", "fuel.ignitionrobotics.org",
+        common::joinPaths("test_cache", "fuel.gazebosim.org",
           "openrobotics", "models", "bus", "1")));
     EXPECT_EQ(path, common::joinPaths(common::cwd(), "test_cache",
-      "fuel.ignitionrobotics.org", "openrobotics", "models", "bus",
+      "fuel.gazebosim.org", "openrobotics", "models", "bus",
       "1", "meshes", "bus.obj"));
     EXPECT_TRUE(common::exists(
-        common::joinPaths("test_cache", "fuel.ignitionrobotics.org",
+        common::joinPaths("test_cache", "fuel.gazebosim.org",
         "openrobotics", "models", "bus", "1", "model.sdf")));
     EXPECT_TRUE(common::exists(
-        common::joinPaths("test_cache", "fuel.ignitionrobotics.org",
+        common::joinPaths("test_cache", "fuel.gazebosim.org",
           "openrobotics", "models", "bus", "1", "model.config")));
     EXPECT_TRUE(common::exists(
-        common::joinPaths("test_cache", "fuel.ignitionrobotics.org",
+        common::joinPaths("test_cache", "fuel.gazebosim.org",
           "openrobotics", "models", "bus", "1", "meshes/bus.obj")));
     EXPECT_TRUE(common::exists(
-        common::joinPaths("test_cache", "fuel.ignitionrobotics.org",
+        common::joinPaths("test_cache", "fuel.gazebosim.org",
           "openrobotics", "models", "bus", "1", "meshes/bus.mtl")));
     EXPECT_TRUE(common::exists(
-        common::joinPaths("test_cache", "fuel.ignitionrobotics.org",
+        common::joinPaths("test_cache", "fuel.gazebosim.org",
           "openrobotics", "models", "bus", "1", "materials", "textures",
           "bus.png")));
 
@@ -152,7 +152,7 @@ TEST(Interface, FetchResources)
       EXPECT_TRUE(res);
       EXPECT_EQ(ResultType::FETCH_ALREADY_EXISTS, res.Type());
       EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache",
-        "fuel.ignitionrobotics.org", "openrobotics", "models", "bus", "1"),
+        "fuel.gazebosim.org", "openrobotics", "models", "bus", "1"),
         cachedPath);
      }
 
@@ -162,7 +162,7 @@ TEST(Interface, FetchResources)
       EXPECT_TRUE(res);
       EXPECT_EQ(ResultType::FETCH_ALREADY_EXISTS, res.Type());
       EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache",
-        "fuel.ignitionrobotics.org", "openrobotics", "models", "bus", "1",
+        "fuel.gazebosim.org", "openrobotics", "models", "bus", "1",
         "meshes", "bus.obj"), cachedPath);
      }
   }
@@ -171,7 +171,7 @@ TEST(Interface, FetchResources)
   {
     // Check it's not cached
     common::URI worldUrl{
-      "https://fuel.ignitionrobotics.org/1.0/openrobotics/worlds/Test world"};
+      "https://fuel.gazebosim.org/1.0/openrobotics/worlds/Test world"};
     {
       Result res = client.CachedWorld(worldUrl, cachedPath);
       EXPECT_FALSE(res) << "Cached Path: " << cachedPath;
@@ -183,13 +183,13 @@ TEST(Interface, FetchResources)
 
     // Check it was downloaded to `1`
     EXPECT_EQ(path, common::joinPaths(common::cwd(), "test_cache",
-      "fuel.ignitionrobotics.org", "openrobotics", "worlds",
+      "fuel.gazebosim.org", "openrobotics", "worlds",
       "test world", "2"));
     EXPECT_TRUE(common::exists(common::joinPaths("test_cache",
-      "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world",
+      "fuel.gazebosim.org", "openrobotics", "worlds", "test world",
       "2")));
     EXPECT_TRUE(common::exists(common::joinPaths("test_cache",
-      "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world", "2",
+      "fuel.gazebosim.org", "openrobotics", "worlds", "test world", "2",
       "test.world")));
 
     // Check it is cached
@@ -198,7 +198,7 @@ TEST(Interface, FetchResources)
       EXPECT_TRUE(res);
       EXPECT_EQ(ResultType::FETCH_ALREADY_EXISTS, res.Type());
       EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache",
-        "fuel.ignitionrobotics.org", "openrobotics", "worlds", "test world",
+        "fuel.gazebosim.org", "openrobotics", "worlds", "test world",
         "2"), cachedPath);
      }
   }
@@ -207,9 +207,9 @@ TEST(Interface, FetchResources)
   {
     // Check neither file nor its world are cached
     common::URI worldUrl{
-      "https://fuel.ignitionrobotics.org/1.0/chapulina/worlds/Test world/2/"};
+      "https://fuel.gazebosim.org/1.0/chapulina/worlds/Test world/2/"};
     common::URI worldFileUrl{
-      "https://fuel.ignitionrobotics.org/1.0/chapulina/worlds/Test world/2/"
+      "https://fuel.gazebosim.org/1.0/chapulina/worlds/Test world/2/"
       "files/thumbnails/1.png"};
 
     {
@@ -228,13 +228,13 @@ TEST(Interface, FetchResources)
 
     // Check entire world was downloaded to `1`
     EXPECT_TRUE(common::exists(
-        common::joinPaths("test_cache", "fuel.ignitionrobotics.org",
+        common::joinPaths("test_cache", "fuel.gazebosim.org",
           "chapulina", "worlds", "test world", "2")));
     EXPECT_EQ(path, common::joinPaths(common::cwd(), "test_cache",
-      "fuel.ignitionrobotics.org", "chapulina", "worlds", "test world", "2",
+      "fuel.gazebosim.org", "chapulina", "worlds", "test world", "2",
       "thumbnails", "1.png"));
     EXPECT_TRUE(common::exists(
-        common::joinPaths("test_cache", "fuel.ignitionrobotics.org",
+        common::joinPaths("test_cache", "fuel.gazebosim.org",
           "chapulina", "worlds", "test world", "2", "test.world")));
 
     // Check world is cached
@@ -243,7 +243,7 @@ TEST(Interface, FetchResources)
       EXPECT_TRUE(res);
       EXPECT_EQ(ResultType::FETCH_ALREADY_EXISTS, res.Type());
       EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache",
-        "fuel.ignitionrobotics.org", "chapulina", "worlds", "test world", "2"),
+        "fuel.gazebosim.org", "chapulina", "worlds", "test world", "2"),
         cachedPath);
      }
 
@@ -253,7 +253,7 @@ TEST(Interface, FetchResources)
       EXPECT_TRUE(res);
       EXPECT_EQ(ResultType::FETCH_ALREADY_EXISTS, res.Type());
       EXPECT_EQ(common::joinPaths(common::cwd(), "test_cache",
-        "fuel.ignitionrobotics.org", "chapulina", "worlds", "test world", "2",
+        "fuel.gazebosim.org", "chapulina", "worlds", "test world", "2",
         "thumbnails", "1.png"), cachedPath);
      }
   }
diff --git a/src/JSONParser_TEST.cc b/src/JSONParser_TEST.cc
index bf0a404e..6b8e8186 100644
--- a/src/JSONParser_TEST.cc
+++ b/src/JSONParser_TEST.cc
@@ -176,7 +176,7 @@ TEST(JSONParser, ParseLicenses)
   std::stringstream tmpJsonStr;
 
   // This is the exact return value from
-  // https://fuel.ignitionrobotics.org/1.0/licenses as of April 29th, 2020.
+  // https://fuel.gazebosim.org/1.0/licenses as of April 29th, 2020.
   tmpJsonStr << R"tmpJsonStr([{
     "ID": 1,
     "CreatedAt": "2017-12-19T20:32:48Z",
diff --git a/src/ModelIdentifier_TEST.cc b/src/ModelIdentifier_TEST.cc
index d5356120..ec55dd08 100644
--- a/src/ModelIdentifier_TEST.cc
+++ b/src/ModelIdentifier_TEST.cc
@@ -155,7 +155,7 @@ TEST(ModelIdentifier, AsString)
         "Name: \n"\
         "Owner: \n"\
         "Version: tip\n"\
-        "Unique name: https://fuel.ignitionrobotics.org/models/\n"
+        "Unique name: https://fuel.gazebosim.org/models/\n"
         "Description: \n"
         "File size: 0\n"
         "Upload date: 0\n"
@@ -166,7 +166,7 @@ TEST(ModelIdentifier, AsString)
         "License image URL: \n"
         "Tags: \n"
         "Server:\n"
-        "  URL: https://fuel.ignitionrobotics.org\n"
+        "  URL: https://fuel.gazebosim.org\n"
         "  Version: 1.0\n"
         "  API key: \n";
 #else
@@ -174,7 +174,7 @@ TEST(ModelIdentifier, AsString)
         "Name: \n"\
         "Owner: \n"\
         "Version: tip\n"\
-        "Unique name: https://fuel.ignitionrobotics.org/models\n"
+        "Unique name: https://fuel.gazebosim.org/models\n"
         "Description: \n"
         "File size: 0\n"
         "Upload date: 0\n"
@@ -185,7 +185,7 @@ TEST(ModelIdentifier, AsString)
         "License image URL: \n"
         "Tags: \n"
         "Server:\n"
-        "  URL: https://fuel.ignitionrobotics.org\n"
+        "  URL: https://fuel.gazebosim.org\n"
         "  Version: 1.0\n"
         "  API key: \n";
 #endif
@@ -223,7 +223,7 @@ TEST(ModelIdentifier, AsPrettyString)
     ModelIdentifier id;
     std::string str =
       "\x1B[96m\x1B[1mServer:\x1B[0m\n  "
-      "\x1B[96m\x1B[1mURL: \x1B[0m\x1B[37mhttps://fuel.ignitionrobotics.org"
+      "\x1B[96m\x1B[1mURL: \x1B[0m\x1B[37mhttps://fuel.gazebosim.org"
       "\x1B[0m\n  \x1B[96m\x1B[1mVersion: \x1B[0m\x1B[37m1.0\x1B[0m\n";
     EXPECT_EQ(str, id.AsPrettyString());
   }
diff --git a/src/ModelIter_TEST.cc b/src/ModelIter_TEST.cc
index 4eb26552..6455bb8a 100644
--- a/src/ModelIter_TEST.cc
+++ b/src/ModelIter_TEST.cc
@@ -45,7 +45,7 @@ namespace ignition
       public: static ModelIter ModelIterThreeModelIds()
         {
           ServerConfig srv;
-          srv.SetUrl(common::URI("https://ignitionrobotics.org"));
+          srv.SetUrl(common::URI("https://gazebosim.org"));
 
           std::vector<ModelIdentifier> ids;
           for (int i = 0; i < 3; i++)
@@ -67,7 +67,7 @@ namespace ignition
       public: static ModelIter ModelIterThreeModels()
         {
           ServerConfig srv;
-          srv.SetUrl(common::URI("https://ignitionrobotics.org"));
+          srv.SetUrl(common::URI("https://gazebosim.org"));
 
           std::vector<Model> models;
           for (int i = 0; i < 3; i++)
diff --git a/src/WorldIdentifier_TEST.cc b/src/WorldIdentifier_TEST.cc
index 8d978ae4..81007fba 100644
--- a/src/WorldIdentifier_TEST.cc
+++ b/src/WorldIdentifier_TEST.cc
@@ -120,10 +120,10 @@ TEST(WorldIdentifier, AsString)
         "Name: \n"\
         "Owner: \n"\
         "Version: tip\n"\
-        "Unique name: fuel.ignitionrobotics.org/worlds/\n"
+        "Unique name: fuel.gazebosim.org/worlds/\n"
         "Local path: \n"
         "Server:\n"
-        "  URL: https://fuel.ignitionrobotics.org\n"
+        "  URL: https://fuel.gazebosim.org\n"
         "  Version: 1.0\n"
         "  API key: \n";
 #else
@@ -131,10 +131,10 @@ TEST(WorldIdentifier, AsString)
         "Name: \n"\
         "Owner: \n"\
         "Version: tip\n"\
-        "Unique name: fuel.ignitionrobotics.org\\worlds\n"
+        "Unique name: fuel.gazebosim.org\\worlds\n"
         "Local path: \n"
         "Server:\n"
-        "  URL: https://fuel.ignitionrobotics.org\n"
+        "  URL: https://fuel.gazebosim.org\n"
         "  Version: 1.0\n"
         "  API key: \n";
 #endif
@@ -164,7 +164,7 @@ TEST(WorldIdentifier, AsPrettyString)
     WorldIdentifier id;
     std::string str =
       "\x1B[96m\x1B[1mServer:\x1B[0m\n  "
-      "\x1B[96m\x1B[1mURL: \x1B[0m\x1B[37mhttps://fuel.ignitionrobotics.org"
+      "\x1B[96m\x1B[1mURL: \x1B[0m\x1B[37mhttps://fuel.gazebosim.org"
       "\x1B[0m\n  \x1B[96m\x1B[1mVersion: \x1B[0m\x1B[37m1.0\x1B[0m\n";
     EXPECT_EQ(str, id.AsPrettyString());
   }
diff --git a/src/WorldIter_TEST.cc b/src/WorldIter_TEST.cc
index dd2c267a..ff8c651b 100644
--- a/src/WorldIter_TEST.cc
+++ b/src/WorldIter_TEST.cc
@@ -44,7 +44,7 @@ namespace ignition
       public: static WorldIter WorldIterThreeWorldIds()
         {
           ServerConfig srv;
-          srv.SetUrl(common::URI("https://ignitionrobotics.org"));
+          srv.SetUrl(common::URI("https://gazebosim.org"));
 
           std::vector<WorldIdentifier> ids;
           for (int i = 0; i < 3; i++)
diff --git a/src/Zip_TEST.cc b/src/Zip_TEST.cc
index 44685a4a..a15c3ed5 100644
--- a/src/Zip_TEST.cc
+++ b/src/Zip_TEST.cc
@@ -16,7 +16,7 @@
 */
 
 // All these helper functions have been copied from
-// https://github.com/ignitionrobotics/ign-common/raw/ign-common3/src/Filesystem_TEST.cc
+// https://github.com/gazebosim/gz-common/raw/ign-common3/src/Filesystem_TEST.cc
 
 #ifndef _WIN32
 #include <fcntl.h>
diff --git a/src/cmd/cmdfuel.rb.in b/src/cmd/cmdfuel.rb.in
index 2e636006..71288740 100755
--- a/src/cmd/cmdfuel.rb.in
+++ b/src/cmd/cmdfuel.rb.in
@@ -72,7 +72,7 @@ SUBCOMMANDS = {
   "Available Options:                                                      \n"\
   "  -u [--url] arg           URL of the server that should receive        \n"\
   "                           the model. If unspecified, the server will be\n"\
-  "                           https://fuel.ignitionrobotics.org.           \n"\
+  "                           https://fuel.gazebosim.org.           \n"\
   "  --header arg             Set an HTTP header, such as                  \n"\
   "                           --header 'authorization: Bearer JWT'.        \n" +
   COMMON_OPTIONS,
@@ -84,7 +84,7 @@ SUBCOMMANDS = {
   "                                                                        \n"\
   "Available Options:                                                      \n"\
   "  -u [--url] arg           Full resource URL, such as:                  \n"\
-  "                           https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Ambulance\n"\
+  "                           https://fuel.gazebosim.org/1.0/openrobotics/models/Ambulance\n"\
   "  --header arg             Set an HTTP header, such as                  \n"\
   "                           --header 'authorization: Bearer JWT'.        \n"\
   "  -j [--jobs] arg          Number of parallel downloads (default: 1,    \n"\
@@ -104,7 +104,7 @@ SUBCOMMANDS = {
   "  -m [--model] arg         Path to directory containing the model.      \n"\
   "  -u [--url] arg           URL of the server that should receive        \n"\
   "                           the model. If unspecified, the server will be\n"\
-  "                           https://fuel.ignitionrobotics.org.           \n"\
+  "                           https://fuel.gazebosim.org.           \n"\
   "  -p [--private]           Use this argument to make the model private. \n"\
   "  -b [--public]            Use this argument to make the model public.  \n"\
   "  --header arg             Set an HTTP header, such as                  \n"\
@@ -121,7 +121,7 @@ SUBCOMMANDS = {
   "  -o [--owner] arg         Return only resources for given owner.       \n"\
   "  -u [--url] arg           URL of a server the resource comes from,     \n"\
   "                           if unspecified, it will be                   \n"\
-  "                           https://fuel.ignitionrobotics.org.           \n"\
+  "                           https://fuel.gazebosim.org.           \n"\
   "  -r [--raw]               Machine-friendly output.                     \n" +
   COMMON_OPTIONS,
 
@@ -148,7 +148,7 @@ SUBCOMMANDS = {
   "                           multiple models each in a subdirectory.      \n"\
   "  -u [--url] arg           URL of the server that should receive        \n"\
   "                           the model. If unspecified, the server will be\n"\
-  "                           https://fuel.ignitionrobotics.org.           \n"\
+  "                           https://fuel.gazebosim.org.           \n"\
   "  -p [--private]           Use this argument to make the model private. \n"\
   "                           Otherwise, the model will be public.         \n"\
   "  --header arg             Set an HTTP header, such as                  \n"\
@@ -248,12 +248,12 @@ class Cmd
     case options['subcommand']
     when 'delete'
       if options['url'] == ''
-        puts "Missing resource URL (e.g. --url https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Ambulance)."
+        puts "Missing resource URL (e.g. --url https://fuel.gazebosim.org/1.0/OpenRobotics/models/Ambulance)."
         exit(-1)
       end
     when 'download'
       if options['url'] == ''
-        puts "Missing resource URL (e.g. --url https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Ambulance)."
+        puts "Missing resource URL (e.g. --url https://fuel.gazebosim.org/1.0/OpenRobotics/models/Ambulance)."
         exit(-1)
       end
 
@@ -294,12 +294,12 @@ class Cmd
         exit(-1)
       end
       if options['url'] == ''
-        puts "Missing URL (e.g. --url https://fuel.ignitionrobotics.org)."
+        puts "Missing URL (e.g. --url https://fuel.gazebosim.org)."
         exit(-1)
       end
     when 'edit'
       if options['url'] == ''
-        puts "Missing resource URL (e.g. --url https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Ambulance)."
+        puts "Missing resource URL (e.g. --url https://fuel.gazebosim.org/1.0/OpenRobotics/models/Ambulance)."
         exit(-1)
       end
     end
diff --git a/src/gz.hh b/src/gz.hh
index 0769d5d1..2f752898 100644
--- a/src/gz.hh
+++ b/src/gz.hh
@@ -85,7 +85,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int upload(const char *_path,
 ///
 /// Example usage, including a private access token which is required:
 ///
-/// `ign fuel delete -u https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Ambulance --header "Private-Token: <access_token>"` // NOLINT
+/// `ign fuel delete -u https://fuel.gazebosim.org/1.0/openrobotics/models/Ambulance --header "Private-Token: <access_token>"` // NOLINT
 ///
 /// \param[in] _url Resource URL.
 /// \param[in] _header An HTTP header.
@@ -112,7 +112,7 @@ extern "C" IGNITION_FUEL_TOOLS_VISIBLE int pbtxt2Config(const char *_path);
 ///
 /// Example usage, including a private access token which is required:
 ///
-/// `ign fuel edit -u https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Ambulance --header "Private-Token: <access_token>"` --public // NOLINT
+/// `ign fuel edit -u https://fuel.gazebosim.org/1.0/openrobotics/models/Ambulance --header "Private-Token: <access_token>"` --public // NOLINT
 ///
 /// \param[in] _url Resource URL.
 /// \param[in] _header An HTTP header.
diff --git a/src/gz_TEST.cc b/src/gz_TEST.cc
index 30cdf24f..f60219ba 100644
--- a/src/gz_TEST.cc
+++ b/src/gz_TEST.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Open Source Robotics Foundation
+ * Copyright (C/ 2018 Open Source Robotics Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ auto g_version = std::string(strdup(IGNITION_FUEL_TOOLS_VERSION_FULL));
 auto g_listCmd = "ign fuel list -v 4 --force-version " + g_version;
 
 /////////////////////////////////////////////////
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/113
+// https://github.com/gazebosim/gz-fuel-tools/issues/113
 TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Versions))
 {
   auto output = custom_exec_str("ign fuel --versions");
@@ -60,7 +60,7 @@ TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Versions))
 }
 
 /////////////////////////////////////////////////
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/113
+// https://github.com/gazebosim/gz-fuel-tools/issues/113
 TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Help))
 {
   auto output = custom_exec_str("ign fuel --force-version " + g_version +
@@ -75,7 +75,7 @@ TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Help))
 }
 
 /////////////////////////////////////////////////
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/113
+// https://github.com/gazebosim/gz-fuel-tools/issues/113
 TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ListFail))
 {
   auto output = custom_exec_str(g_listCmd);
@@ -94,57 +94,57 @@ TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ListFail))
 }
 
 /////////////////////////////////////////////////
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/113
+// https://github.com/gazebosim/gz-fuel-tools/issues/113
 TEST(CmdLine,
     IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ModelListConfigServerUgly))
 {
   auto output = custom_exec_str(g_listCmd + " -t model --raw");
-  EXPECT_NE(output.find("https://fuel.ignitionrobotics.org/1.0/"),
+  EXPECT_NE(output.find("https://fuel.gazebosim.org/1.0/"),
             std::string::npos) << output;
   EXPECT_EQ(output.find("owners"), std::string::npos) << output;
 }
 
 /////////////////////////////////////////////////
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/113
+// https://github.com/gazebosim/gz-fuel-tools/issues/113
 // https://github.com/gazebosim/gz-fuel-tools/issues/254
 TEST(CmdLine,
     DETAIL_IGN_UTILS_ADD_DISABLED_PREFIX(ModelListCustomServerPretty))
 {
   auto output = custom_exec_str(
-      g_listCmd + " -t model -u https://staging-fuel.ignitionrobotics.org");
+      g_listCmd + " -t model -u https://staging-fuel.gazebosim.org");
 
-  EXPECT_NE(output.find("https://staging-fuel.ignitionrobotics.org"),
+  EXPECT_NE(output.find("https://staging-fuel.gazebosim.org"),
       std::string::npos) << output;
   EXPECT_NE(output.find("owners"), std::string::npos) << output;
   EXPECT_NE(output.find("models"), std::string::npos) << output;
 
-  EXPECT_EQ(output.find("https://fuel.ignitionrobotics.org"), std::string::npos)
+  EXPECT_EQ(output.find("https://fuel.gazebosim.org"), std::string::npos)
       << output;
-  EXPECT_EQ(output.find("https://staging-fuel.ignitionrobotics.org/1.0/"),
+  EXPECT_EQ(output.find("https://staging-fuel.gazebosim.org/1.0/"),
       std::string::npos) << output;
 }
 
 /////////////////////////////////////////////////
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/113
+// https://github.com/gazebosim/gz-fuel-tools/issues/113
 TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldListConfigServerUgly))
 {
   auto output = custom_exec_str(g_listCmd +
-      " -t world --raw -u https://staging-fuel.ignitionrobotics.org");
-  EXPECT_NE(output.find("https://staging-fuel.ignitionrobotics.org"),
+      " -t world --raw -u https://staging-fuel.gazebosim.org");
+  EXPECT_NE(output.find("https://staging-fuel.gazebosim.org"),
       std::string::npos) << output;
   EXPECT_EQ(output.find("owners"), std::string::npos) << output;
 }
 
 /////////////////////////////////////////////////
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/113
+// https://github.com/gazebosim/gz-fuel-tools/issues/113
 // https://github.com/gazebosim/gz-fuel-tools/issues/254
 TEST(CmdLine,
     DETAIL_IGN_UTILS_ADD_DISABLED_PREFIX(WorldListCustomServerPretty))
 {
   auto output = custom_exec_str(
-      g_listCmd + " -t world -u https://staging-fuel.ignitionrobotics.org");
+      g_listCmd + " -t world -u https://staging-fuel.gazebosim.org");
 
-  EXPECT_NE(output.find("https://staging-fuel.ignitionrobotics.org"),
+  EXPECT_NE(output.find("https://staging-fuel.gazebosim.org"),
       std::string::npos) << output;
   EXPECT_NE(output.find("owners"), std::string::npos) << output;
   EXPECT_NE(output.find("worlds"), std::string::npos) << output;
diff --git a/src/gz_src_TEST.cc b/src/gz_src_TEST.cc
index 10d6ff91..1ca4e8f9 100644
--- a/src/gz_src_TEST.cc
+++ b/src/gz_src_TEST.cc
@@ -90,12 +90,12 @@ TEST_F(CmdLine, ModelListFail)
 
 /////////////////////////////////////////////////
 // Protocol "https" not supported or disabled in libcurl for Windows
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105
+// https://github.com/gazebosim/gz-fuel-tools/issues/105
 TEST_F(CmdLine, ModelListConfigServerUgly)
 {
-  EXPECT_TRUE(listModels("", "", "true"));
+  EXPECT_TRUE(listModels("", "openroboticstest", "true"));
 
-  EXPECT_NE(this->stdOutBuffer.str().find("https://fuel.ignitionrobotics.org"),
+  EXPECT_NE(this->stdOutBuffer.str().find("https://fuel.gazebosim.org"),
       std::string::npos) << this->stdOutBuffer.str();
   EXPECT_EQ(this->stdOutBuffer.str().find("owners"), std::string::npos)
       << this->stdOutBuffer.str();
@@ -103,40 +103,40 @@ TEST_F(CmdLine, ModelListConfigServerUgly)
 
 /////////////////////////////////////////////////
 // Protocol "https" not supported or disabled in libcurl for Windows
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105
+// https://github.com/gazebosim/gz-fuel-tools/issues/105
 // https://github.com/gazebosim/gz-fuel-tools/issues/254
 TEST_F(CmdLine,
        DETAIL_IGN_UTILS_ADD_DISABLED_PREFIX(ModelListConfigServerPretty))
 {
-  EXPECT_TRUE(listModels("https://staging-fuel.ignitionrobotics.org"));
+  EXPECT_TRUE(listModels("https://staging-fuel.gazebosim.org"));
 
   EXPECT_NE(this->stdOutBuffer.str().find(
-        "https://staging-fuel.ignitionrobotics.org"),
+        "https://staging-fuel.gazebosim.org"),
       std::string::npos) << this->stdOutBuffer.str();
   EXPECT_NE(this->stdOutBuffer.str().find("owners"), std::string::npos)
       << this->stdOutBuffer.str();
   EXPECT_NE(this->stdOutBuffer.str().find("models"), std::string::npos)
       << this->stdOutBuffer.str();
 
-  EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.ignitionrobotics.org"),
+  EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.gazebosim.org"),
       std::string::npos) << this->stdOutBuffer.str();
   EXPECT_EQ(this->stdOutBuffer.str().find(
-      "https://staging-fuel.ignitionrobotics.org/1.0/"), std::string::npos)
+      "https://staging-fuel.gazebosim.org/1.0/"), std::string::npos)
       << this->stdOutBuffer.str();
 }
 
 /////////////////////////////////////////////////
 // Protocol "https" not supported or disabled in libcurl for Windows
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105
+// https://github.com/gazebosim/gz-fuel-tools/issues/105
 // https://github.com/gazebosim/gz-fuel-tools/issues/254
 TEST_F(CmdLine,
        DETAIL_IGN_UTILS_ADD_DISABLED_PREFIX(ModelListConfigServerPrettyOwner))
 {
-  EXPECT_TRUE(listModels("https://staging-fuel.ignitionrobotics.org",
+  EXPECT_TRUE(listModels("https://staging-fuel.gazebosim.org",
       "openrobotics"));
 
   EXPECT_NE(this->stdOutBuffer.str().find(
-        "https://staging-fuel.ignitionrobotics.org"),
+        "https://staging-fuel.gazebosim.org"),
       std::string::npos) << this->stdOutBuffer.str();
   EXPECT_NE(this->stdOutBuffer.str().find("1 owners"), std::string::npos)
       << this->stdOutBuffer.str();
@@ -147,10 +147,10 @@ TEST_F(CmdLine,
   EXPECT_EQ(this->stdOutBuffer.str().find("20 models"), std::string::npos)
       << this->stdOutBuffer.str();
 
-  EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.ignitionrobotics.org"),
+  EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.gazebosim.org"),
       std::string::npos) << this->stdOutBuffer.str();
   EXPECT_EQ(this->stdOutBuffer.str().find(
-      "https://staging-fuel.ignitionrobotics.org/1.0/"), std::string::npos)
+      "https://staging-fuel.gazebosim.org/1.0/"), std::string::npos)
       << this->stdOutBuffer.str();
 }
 
@@ -177,12 +177,12 @@ TEST_F(CmdLine, ModelDownloadWrongUrl)
 
 /////////////////////////////////////////////////
 // Protocol "https" not supported or disabled in libcurl for Windows
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105
+// https://github.com/gazebosim/gz-fuel-tools/issues/105
 TEST_F(CmdLine, ModelDownloadUnversioned)
 {
   // Download
   EXPECT_TRUE(downloadUrl(
-      "https://fuel.ignitionrobotics.org/1.0/chapulina/models/Test box"));
+    "https://fuel.gazebosim.org/1.0/openroboticstest/models/Test box"));
 
   // Check output
   EXPECT_NE(this->stdOutBuffer.str().find("Download succeeded"),
@@ -191,19 +191,19 @@ TEST_F(CmdLine, ModelDownloadUnversioned)
 
   // Check files
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
-      "chapulina", "models", "test box")));
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
+      "openroboticstest", "models", "test box")));
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
-      "chapulina", "models", "test box", "2")));
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
+      "openroboticstest", "models", "test box", "1")));
   EXPECT_TRUE(common::isFile(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
-      "chapulina", "models", "test box", "2", "model.sdf")));
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
+      "openroboticstest", "models", "test box", "1", "model.sdf")));
 }
 
 /////////////////////////////////////////////////
 // Protocol "https" not supported or disabled in libcurl for Windows
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105
+// https://github.com/gazebosim/gz-fuel-tools/issues/105
 TEST_F(CmdLine, DownloadConfigCache)
 {
   unsetenv("IGN_FUEL_CACHE_PATH");
@@ -216,7 +216,7 @@ TEST_F(CmdLine, DownloadConfigCache)
   ofs << "---"                                    << std::endl
       << "servers:"                               << std::endl
       << "  -"                                    << std::endl
-      << "    url: https://fuel.ignitionrobotics.org"  << std::endl
+      << "    url: https://fuel.gazebosim.org"  << std::endl
       << ""                                       << std::endl
       << "cache:"                                 << std::endl
       << "  path: " << this->testCachePath << std::endl
@@ -226,7 +226,7 @@ TEST_F(CmdLine, DownloadConfigCache)
 
   // Download
   EXPECT_TRUE(downloadUrl(
-      "https://fuel.ignitionrobotics.org/1.0/chapulina/models/Test box",
+      "https://fuel.gazebosim.org/1.0/openroboticstest/models/Test box",
       testPath.c_str()));
 
   // Check output
@@ -236,10 +236,10 @@ TEST_F(CmdLine, DownloadConfigCache)
 
   // Check files
   auto modelPath = common::joinPaths(this->testCachePath,
-      "fuel.ignitionrobotics.org", "chapulina", "models", "test box");
+      "fuel.gazebosim.org", "openroboticstest", "models", "test box");
   EXPECT_TRUE(common::isDirectory(modelPath));
-  EXPECT_TRUE(common::isDirectory(common::joinPaths(modelPath, "2")));
-  EXPECT_TRUE(common::isFile(common::joinPaths(modelPath, "2",
+  EXPECT_TRUE(common::isDirectory(common::joinPaths(modelPath, "1")));
+  EXPECT_TRUE(common::isFile(common::joinPaths(modelPath, "1",
       "model.sdf")));
 }
 
@@ -255,16 +255,16 @@ TEST_F(CmdLine, WorldListFail)
 
 /////////////////////////////////////////////////
 // Protocol "https" not supported or disabled in libcurl for Windows
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105
+// https://github.com/gazebosim/gz-fuel-tools/issues/105
 // https://github.com/gazebosim/gz-fuel-tools/issues/254
 TEST_F(CmdLine,
        DETAIL_IGN_UTILS_ADD_DISABLED_PREFIX(WorldListConfigServerUgly))
 {
   EXPECT_TRUE(listWorlds(
-        "https://staging-fuel.ignitionrobotics.org", "", "true"));
+        "https://staging-fuel.gazebosim.org", "", "true"));
 
   EXPECT_NE(this->stdOutBuffer.str().find(
-        "https://staging-fuel.ignitionrobotics.org"),
+        "https://staging-fuel.gazebosim.org"),
       std::string::npos) << this->stdOutBuffer.str();
   EXPECT_EQ(this->stdOutBuffer.str().find("owners"), std::string::npos)
       << this->stdOutBuffer.str();
@@ -272,36 +272,36 @@ TEST_F(CmdLine,
 
 /////////////////////////////////////////////////
 // Protocol "https" not supported or disabled in libcurl for Windows
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105
+// https://github.com/gazebosim/gz-fuel-tools/issues/105
 // https://github.com/gazebosim/gz-fuel-tools/issues/254
 TEST_F(CmdLine,
        DETAIL_IGN_UTILS_ADD_DISABLED_PREFIX(WorldListConfigServerPretty))
 {
-  EXPECT_TRUE(listWorlds("https://staging-fuel.ignitionrobotics.org"));
+  EXPECT_TRUE(listWorlds("https://staging-fuel.gazebosim.org"));
 
   EXPECT_NE(this->stdOutBuffer.str().find(
-        "https://staging-fuel.ignitionrobotics.org"), std::string::npos)
+        "https://staging-fuel.gazebosim.org"), std::string::npos)
     << this->stdOutBuffer.str();
   EXPECT_NE(this->stdOutBuffer.str().find("owners"), std::string::npos)
       << this->stdOutBuffer.str();
   EXPECT_NE(this->stdOutBuffer.str().find("worlds"), std::string::npos)
       << this->stdOutBuffer.str();
 
-  EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.ignitionrobotics.org"),
+  EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.gazebosim.org"),
       std::string::npos) << this->stdOutBuffer.str();
   EXPECT_EQ(this->stdOutBuffer.str().find(
-      "https://staging-fuel.ignitionrobotics.org/1.0/"), std::string::npos)
+      "https://staging-fuel.gazebosim.org/1.0/"), std::string::npos)
       << this->stdOutBuffer.str();
 }
 
 /////////////////////////////////////////////////
 TEST_F(CmdLine, WorldListCustomServerPrettyOwner)
 {
-  EXPECT_TRUE(listWorlds("https://staging-fuel.ignitionrobotics.org",
+  EXPECT_TRUE(listWorlds("https://staging-fuel.gazebosim.org",
       "openrobotics"));
 
   EXPECT_NE(this->stdOutBuffer.str().find(
-        "https://staging-fuel.ignitionrobotics.org"), std::string::npos)
+        "https://staging-fuel.gazebosim.org"), std::string::npos)
     << this->stdOutBuffer.str();
   EXPECT_NE(this->stdOutBuffer.str().find("worlds"), std::string::npos)
       << this->stdOutBuffer.str();
@@ -310,16 +310,16 @@ TEST_F(CmdLine, WorldListCustomServerPrettyOwner)
   EXPECT_EQ(this->stdOutBuffer.str().find("20 worlds"), std::string::npos)
       << this->stdOutBuffer.str();
 
-  EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.ignitionrobotics.org"),
+  EXPECT_EQ(this->stdOutBuffer.str().find("https://fuel.gazebosim.org"),
       std::string::npos) << this->stdOutBuffer.str();
   EXPECT_EQ(this->stdOutBuffer.str().find(
-      "https://staging-fuel.ignitionrobotics.org/1.0/"), std::string::npos)
+      "https://staging-fuel.gazebosim.org/1.0/"), std::string::npos)
       << this->stdOutBuffer.str();
 }
 
 /////////////////////////////////////////////////
 // Protocol "https" not supported or disabled in libcurl for Windows
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105
+// https://github.com/gazebosim/gz-fuel-tools/issues/105
 TEST_F(CmdLine, WorldDownloadBadUrl)
 {
   EXPECT_FALSE(downloadUrl("fake_url"));
@@ -342,12 +342,12 @@ TEST_F(CmdLine, WorldDownloadWrongUrl)
 
 /////////////////////////////////////////////////
 // Protocol "https" not supported or disabled in libcurl for Windows
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105
+// https://github.com/gazebosim/gz-fuel-tools/issues/105
 TEST_F(CmdLine, WorldDownloadUnversioned)
 {
   // Download
   EXPECT_TRUE(downloadUrl(
-      "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Test world"));
+      "https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Test world"));
 
   // Check output
   EXPECT_NE(this->stdOutBuffer.str().find("Download succeeded"),
@@ -356,13 +356,13 @@ TEST_F(CmdLine, WorldDownloadUnversioned)
 
   // Check files
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "worlds", "test world")));
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "worlds", "test world", "2")));
   EXPECT_TRUE(common::isFile(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "worlds", "test world", "2", "test.world")));
 }
 
@@ -376,12 +376,12 @@ INSTANTIATE_TEST_CASE_P(CollectionTest, DownloadCollectionTest,
 
 /////////////////////////////////////////////////
 // Protocol "https" not supported or disabled in libcurl for Windows
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105
+// https://github.com/gazebosim/gz-fuel-tools/issues/105
 TEST_P(DownloadCollectionTest, AllItems)
 {
   // Download
   EXPECT_TRUE(
-      downloadUrl("https://fuel.ignitionrobotics.org/1.0/OpenRobotics/"
+      downloadUrl("https://fuel.gazebosim.org/1.0/OpenRobotics/"
                   "collections/TestCollection",
                   nullptr, nullptr, nullptr, GetParam()));
 
@@ -393,58 +393,58 @@ TEST_P(DownloadCollectionTest, AllItems)
   // Check files
   // Model: Backpack
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "models", "backpack")));
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "models", "backpack", "2")));
   EXPECT_TRUE(common::isFile(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "models", "backpack", "2", "model.sdf")));
 
   // Model: TEAMBASE
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "models", "teambase")));
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "models", "teambase", "2")));
   EXPECT_TRUE(common::isFile(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
      "openrobotics", "models", "teambase", "2", "model.sdf")));
 
   // World: Test World
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "worlds", "test world")));
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "worlds", "test world", "2")));
   EXPECT_TRUE(common::isFile(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "worlds", "test world", "2", "test.world")));
 
   // World: Test World 2
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "worlds", "test world 2")));
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "worlds", "test world 2", "2")));
   EXPECT_TRUE(common::isFile(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "worlds", "test world 2", "2", "test.world")));
 }
 
 /////////////////////////////////////////////////
 /// Download only models
 // Protocol "https" not supported or disabled in libcurl for Windows
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105
+// https://github.com/gazebosim/gz-fuel-tools/issues/105
 TEST_P(DownloadCollectionTest, Models)
 {
   // Download
   EXPECT_TRUE(
-      downloadUrl("https://fuel.ignitionrobotics.org/1.0/OpenRobotics/"
+      downloadUrl("https://fuel.gazebosim.org/1.0/OpenRobotics/"
                   "collections/TestCollection",
                   nullptr, nullptr, "model", GetParam()));
 
@@ -456,46 +456,46 @@ TEST_P(DownloadCollectionTest, Models)
   // Check files
   // Model: Backpack
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "models", "backpack")));
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "models", "backpack", "2")));
   EXPECT_TRUE(common::isFile(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "models", "backpack", "2", "model.sdf")));
 
   // Model: TEAMBASE
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "models", "teambase")));
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "models", "teambase", "2")));
   EXPECT_TRUE(common::isFile(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "models", "teambase", "2", "model.sdf")));
 
   // World: Test World
   EXPECT_FALSE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "worlds", "test world")));
 
   // World: Test World 2
   EXPECT_FALSE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "worlds", "test world2")));
 }
 
 /////////////////////////////////////////////////
 /// Download only worlds
 // Protocol "https" not supported or disabled in libcurl for Windows
-// https://github.com/ignitionrobotics/ign-fuel-tools/issues/105
+// https://github.com/gazebosim/gz-fuel-tools/issues/105
 TEST_P(DownloadCollectionTest, Worlds)
 {
   // Download
   EXPECT_TRUE(
-      downloadUrl("https://fuel.ignitionrobotics.org/1.0/OpenRobotics/"
+      downloadUrl("https://fuel.gazebosim.org/1.0/OpenRobotics/"
                   "collections/TestCollection",
                   nullptr, nullptr, "world", GetParam()));
 
@@ -507,33 +507,33 @@ TEST_P(DownloadCollectionTest, Worlds)
   // Check files
   // Model: Backpack
   EXPECT_FALSE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "models", "backpack")));
 
   // Model: TEAMBASE
   EXPECT_FALSE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "models", "teambase")));
 
   // World: Test World
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "worlds", "test world")));
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "worlds", "test world", "2")));
   EXPECT_TRUE(common::isFile(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "worlds", "test world", "2", "test.world")));
 
   // World: Test World 2
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "worlds", "test world 2")));
   EXPECT_TRUE(common::isDirectory(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "worlds", "test world 2", "2")));
   EXPECT_TRUE(common::isFile(
-    common::joinPaths(this->testCachePath, "fuel.ignitionrobotics.org",
+    common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
       "openrobotics", "worlds", "test world 2", "2", "test.world")));
 }