diff --git a/core/lib/Drupal/Core/Entity/Controller/EntityController.php b/core/lib/Drupal/Core/Entity/Controller/EntityController.php
index 4ca97e4..0e829a2 100644
--- a/core/lib/Drupal/Core/Entity/Controller/EntityController.php
+++ b/core/lib/Drupal/Core/Entity/Controller/EntityController.php
@@ -75,7 +75,7 @@ class EntityController implements ContainerInjectionInterface {
    * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
    *   The string translation.
    * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
-   *   The url generator.
+   *   The URL generator.
    */
   public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $entity_type_bundle_info, EntityRepositoryInterface $entity_repository, RendererInterface $renderer, TranslationInterface $string_translation, UrlGeneratorInterface $url_generator) {
     $this->entityTypeManager = $entity_type_manager;
diff --git a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
index 70829cd..63e662a 100644
--- a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
+++ b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
@@ -5,7 +5,7 @@
 use Symfony\Cmf\Component\Routing\VersatileGeneratorInterface;
 
 /**
- * Defines an interface for generating a url from a route or system path.
+ * Defines an interface for generating a URL from a route or system path.
  *
  * Provides additional methods and options not present in the base interface.
  */
diff --git a/core/lib/Drupal/Core/Utility/LinkGenerator.php b/core/lib/Drupal/Core/Utility/LinkGenerator.php
index ddb9aea..9e4e495 100644
--- a/core/lib/Drupal/Core/Utility/LinkGenerator.php
+++ b/core/lib/Drupal/Core/Utility/LinkGenerator.php
@@ -100,7 +100,7 @@ public function generate($text, Url $url) {
       'absolute' => FALSE,
     );
 
-    // Add a hreflang attribute if we know the language of this link's url and
+    // Add a hreflang attribute if we know the language of this link's URL and
     // hreflang has not already been set.
     if (!empty($variables['options']['language']) && !isset($variables['options']['attributes']['hreflang'])) {
       $variables['options']['attributes']['hreflang'] = $variables['options']['language']->getId();
diff --git a/core/modules/ckeditor/js/ckeditor.js b/core/modules/ckeditor/js/ckeditor.js
index 047211b..ee1f5c5 100644
--- a/core/modules/ckeditor/js/ckeditor.js
+++ b/core/modules/ckeditor/js/ckeditor.js
@@ -216,7 +216,7 @@
      * @param {string} url
      *   The URL that contains the contents of the dialog.
      * @param {object} existingValues
-     *   Existing values that will be sent via POST to the url for the dialog
+     *   Existing values that will be sent via POST to the URL for the dialog
      *   contents.
      * @param {function} saveCallback
      *   A function to be called upon saving the dialog.
diff --git a/core/modules/comment/src/CommentManager.php b/core/modules/comment/src/CommentManager.php
index fcec230..db98808 100644
--- a/core/modules/comment/src/CommentManager.php
+++ b/core/modules/comment/src/CommentManager.php
@@ -78,7 +78,7 @@ class CommentManager implements CommentManagerInterface {
    * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
    *   The string translation service.
    * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
-   *   The url generator service.
+   *   The URL generator service.
    *  @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
    *   The module handler service.
    * @param \Drupal\Core\Session\AccountInterface $current_user
diff --git a/core/modules/comment/src/Tests/CommentNonNodeTest.php b/core/modules/comment/src/Tests/CommentNonNodeTest.php
index e43e0bc..9a8173b 100644
--- a/core/modules/comment/src/Tests/CommentNonNodeTest.php
+++ b/core/modules/comment/src/Tests/CommentNonNodeTest.php
@@ -437,7 +437,7 @@ function testCommentFunctionality() {
     $this->assertFieldChecked('edit-field-foobar-0-status-2');
     $this->assertNoField('edit-field-foobar-0-status-0');
 
-    // @todo Check proper url and form https://www.drupal.org/node/2458323
+    // @todo Check proper URL and form https://www.drupal.org/node/2458323
     $this->drupalGet('comment/reply/entity_test/comment/' . $new_entity->id());
     $this->assertNoFieldByName('subject[0][value]', '', 'Subject field found.');
     $this->assertNoFieldByName('comment_body[0][value]', '', 'Comment field found.');
diff --git a/core/modules/comment/src/Tests/CommentTitleTest.php b/core/modules/comment/src/Tests/CommentTitleTest.php
index aab1cf5..c60aa06 100644
--- a/core/modules/comment/src/Tests/CommentTitleTest.php
+++ b/core/modules/comment/src/Tests/CommentTitleTest.php
@@ -62,7 +62,7 @@ public function testCommentPopulatedTitles() {
     // Tests that the comment's title link is the permalink of the comment.
     $comment_permalink = $this->cssSelect('.permalink');
     $comment_permalink = (string) $comment_permalink[0]['href'];
-    // Tests that the comment's title link contains the url fragment.
+    // Tests that the comment's title link contains the URL fragment.
     $this->assertTrue(strpos($comment_permalink, '#comment-' . $comment1->id()), "The comment's title link contains the url fragment.");
     $this->assertEqual($comment1->permalink()->toString(), $comment_permalink, "The comment's title has the correct link.");
   }
diff --git a/core/modules/link/tests/src/Unit/Plugin/migrate/process/d6/CckLinkTest.php b/core/modules/link/tests/src/Unit/Plugin/migrate/process/d6/CckLinkTest.php
index a96287a..5da848c 100644
--- a/core/modules/link/tests/src/Unit/Plugin/migrate/process/d6/CckLinkTest.php
+++ b/core/modules/link/tests/src/Unit/Plugin/migrate/process/d6/CckLinkTest.php
@@ -11,7 +11,7 @@
 class CckLinkTest extends UnitTestCase {
 
   /**
-   * Test the url transformations in the CckLink process plugin.
+   * Test the URL transformations in the CckLink process plugin.
    *
    * @dataProvider canonicalizeUriDataProvider
    */
diff --git a/core/modules/path/src/Plugin/migrate/process/d6/UrlAliasLanguage.php b/core/modules/path/src/Plugin/migrate/process/d6/UrlAliasLanguage.php
index b5d527b..05234ae 100644
--- a/core/modules/path/src/Plugin/migrate/process/d6/UrlAliasLanguage.php
+++ b/core/modules/path/src/Plugin/migrate/process/d6/UrlAliasLanguage.php
@@ -8,7 +8,7 @@
 use Drupal\Core\Language\LanguageInterface;
 
 /**
- * Url alias language code process.
+ * URL alias language code process.
  *
  * @MigrateProcessPlugin(
  *   id = "d6_url_alias_language"
diff --git a/core/modules/quickedit/js/util.js b/core/modules/quickedit/js/util.js
index 4b0a4c4..e1682d4 100644
--- a/core/modules/quickedit/js/util.js
+++ b/core/modules/quickedit/js/util.js
@@ -24,7 +24,7 @@
   Drupal.quickedit.util.constants.transitionEnd = 'transitionEnd.quickedit webkitTransitionEnd.quickedit transitionend.quickedit msTransitionEnd.quickedit oTransitionEnd.quickedit';
 
   /**
-   * Converts a field id into a formatted url path.
+   * Converts a field id into a formatted URL path.
    *
    * @example
    * Drupal.quickedit.util.buildUrl(
diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
index 0739fc5..f3a111e 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -1441,7 +1441,7 @@ protected function drupalGetXHR($path, array $options = array(), array $headers
    *   textfield: under these conditions, no button information is added to the
    *   POST data.
    * @param $options
-   *   Options to be forwarded to the url generator.
+   *   Options to be forwarded to the URL generator.
    * @param $headers
    *   An array containing additional HTTP request headers, each formatted as
    *   "name: value".
@@ -1988,7 +1988,7 @@ protected function checkForMetaRefresh() {
    * @param $path
    *   Drupal path or URL to load into internal browser
    * @param $options
-   *   Options to be forwarded to the url generator.
+   *   Options to be forwarded to the URL generator.
    * @param $headers
    *   An array containing additional HTTP request headers, each formatted as
    *   "name: value".
@@ -2508,7 +2508,7 @@ protected function assertNoResponse($code, $message = '', $group = 'Browser') {
    *
    * This is used to manipulate how the generator generates paths during tests.
    * It also ensures that calls to $this->drupalGet() will work when running
-   * from run-tests.sh because the url generator no longer looks at the global
+   * from run-tests.sh because the URL generator no longer looks at the global
    * variables that are set there but relies on getting this information from a
    * request object.
    *
diff --git a/core/modules/tour/js/tour.js b/core/modules/tour/js/tour.js
index 2c7050f..7b24090 100644
--- a/core/modules/tour/js/tour.js
+++ b/core/modules/tour/js/tour.js
@@ -15,7 +15,7 @@
    * It uses the query string for:
    * - tour: When ?tour=1 is present, the tour will start automatically after
    *   the page has loaded.
-   * - tips: Pass ?tips=class in the url to filter the available tips to the
+   * - tips: Pass ?tips=class in the URL to filter the available tips to the
    *   subset which match the given class.
    *
    * @example
diff --git a/core/modules/update/tests/src/Unit/UpdateFetcherTest.php b/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
index e7468cc..866c7af 100644
--- a/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
+++ b/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
@@ -59,7 +59,7 @@ public function testUpdateBuildFetchUrl(array $project, $site_key, $expected) {
    *   An array of arrays, each containing:
    *   - 'project' - An array matching a project's .info file structure.
    *   - 'site_key' - An arbitrary site key.
-   *   - 'expected' - The expected url from UpdateFetcher::buildFetchUrl().
+   *   - 'expected' - The expected URL from UpdateFetcher::buildFetchUrl().
    */
   public function providerTestUpdateBuildFetchUrl() {
     $data = array();
diff --git a/core/modules/user/src/Tests/UserPasswordResetTest.php b/core/modules/user/src/Tests/UserPasswordResetTest.php
index c012e9f..73393fc 100644
--- a/core/modules/user/src/Tests/UserPasswordResetTest.php
+++ b/core/modules/user/src/Tests/UserPasswordResetTest.php
@@ -95,7 +95,7 @@ function testUserPasswordReset() {
 
     $resetURL = $this->getResetURL();
     $this->drupalGet($resetURL);
-    // Ensure that the current url does not contain the hash and timestamp.
+    // Ensure that the current URL does not contain the hash and timestamp.
     $this->assertUrl(Url::fromRoute('user.reset.form', ['uid' => $this->account->id()]));
 
     $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'));
diff --git a/core/modules/views/js/ajax_view.js b/core/modules/views/js/ajax_view.js
index 6422dd0..655d687 100644
--- a/core/modules/views/js/ajax_view.js
+++ b/core/modules/views/js/ajax_view.js
@@ -66,7 +66,7 @@
       // Remove the question mark and Drupal path component if any.
       queryString = queryString.slice(1).replace(/q=[^&]+&?|&?render=[^&]+/, '');
       if (queryString !== '') {
-        // If there is a '?' in ajax_path, clean url are on and & should be
+        // If there is a '?' in ajax_path, clean URL are on and & should be
         // used to add parameters.
         queryString = ((/\?/.test(ajax_path)) ? '&' : '?') + queryString;
       }
diff --git a/core/modules/views/js/base.js b/core/modules/views/js/base.js
index cca3be4..bf5dce2 100644
--- a/core/modules/views/js/base.js
+++ b/core/modules/views/js/base.js
@@ -53,7 +53,7 @@
   Drupal.Views.parseViewArgs = function (href, viewPath) {
     var returnObj = {};
     var path = Drupal.Views.getPath(href);
-    // Get viewPath url without baseUrl portion.
+    // Get viewPath URL without baseUrl portion.
     var viewHref = Drupal.url(viewPath).substring(drupalSettings.path.baseUrl.length);
     // Ensure we have a correct path.
     if (viewHref && path.substring(0, viewHref.length + 1) === viewHref + '/') {
@@ -94,7 +94,7 @@
   Drupal.Views.getPath = function (href) {
     href = Drupal.Views.pathPortion(href);
     href = href.substring(drupalSettings.path.baseUrl.length, href.length);
-    // 3 is the length of the '?q=' added to the url without clean urls.
+    // 3 is the length of the '?q=' added to the URL without clean urls.
     if (href.substring(0, 3) === '?q=') {
       href = href.substring(3, href.length);
     }
diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index 5c9fc66..db1b0b0 100644
--- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -1397,7 +1397,7 @@ protected function renderAsLink($alter, $text, $tokens) {
       }
 
       // If no scheme is provided in the $path, assign the default 'http://'.
-      // This allows a url of 'www.example.com' to be converted to
+      // This allows a URL of 'www.example.com' to be converted to
       // 'http://www.example.com'.
       // Only do this when flag for external has been set, $path doesn't contain
       // a scheme and $path doesn't have a leading /.
@@ -1445,7 +1445,7 @@ protected function renderAsLink($alter, $text, $tokens) {
       return $text;
     }
 
-    // If we get to here we have a path from the url parsing. So assign that to
+    // If we get to here we have a path from the URL parsing. So assign that to
     // $path now so we don't get query strings or fragments in the path.
     $path = $url['path'];
 
@@ -1529,7 +1529,7 @@ protected function renderAsLink($alter, $text, $tokens) {
       $options['language'] = $alter['language'];
     }
 
-    // If the url came from entity_uri(), pass along the required options.
+    // If the URL came from entity_uri(), pass along the required options.
     if (isset($alter['entity'])) {
       $options['entity'] = $alter['entity'];
     }
@@ -1540,7 +1540,7 @@ protected function renderAsLink($alter, $text, $tokens) {
     // The path has been heavily processed above, so it should be used as-is.
     $final_url = CoreUrl::fromUri($path, $options);
 
-    // Build the link based on our altered Url object, adding on the optional
+    // Build the link based on our altered URL object, adding on the optional
     // prefix and suffix
     $render = [
       '#type' => 'link',
diff --git a/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php b/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php
index 2546e59..de198b3 100644
--- a/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php
@@ -232,7 +232,7 @@ public function testRenderAsLinkWithoutPath() {
    * @param string $path
    *   An internal or external path.
    * @param string $url
-   *   The final url used by the more link.
+   *   The final URL used by the more link.
    *
    * @dataProvider providerTestRenderTrimmedWithMoreLinkAndPath
    * @covers ::renderText
diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php
index 5dfa68a..8a33d56 100644
--- a/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -696,7 +696,7 @@ protected function buildUrl($path, array $options = array()) {
    * @param string|\Drupal\Core\Url $path
    *   Drupal path or URL to load into Mink controlled browser.
    * @param array $options
-   *   (optional) Options to be forwarded to the url generator.
+   *   (optional) Options to be forwarded to the URL generator.
    * @param string[] $headers
    *   An array containing additional HTTP request headers, the array keys are
    *   the header names and the array values the header values. This is useful
@@ -980,7 +980,7 @@ protected function submitForm(array $edit, $submit, $form_html_id = NULL) {
    *   textfield: under these conditions, no button information is added to the
    *   POST data.
    * @param array $options
-   *   Options to be forwarded to the url generator.
+   *   Options to be forwarded to the URL generator.
    */
   protected function drupalPostForm($path, $edit, $submit, array $options = array()) {
     if (is_object($submit)) {
@@ -1426,7 +1426,7 @@ protected function rebuildContainer() {
     // Rebuild the kernel and bring it back to a fully bootstrapped state.
     $this->container = $this->kernel->rebuildContainer();
 
-    // Make sure the url generator has a request object, otherwise calls to
+    // Make sure the URL generator has a request object, otherwise calls to
     // $this->drupalGet() will fail.
     $this->prepareRequestForGenerator();
   }
@@ -1436,7 +1436,7 @@ protected function rebuildContainer() {
    *
    * This is used to manipulate how the generator generates paths during tests.
    * It also ensures that calls to $this->drupalGet() will work when running
-   * from run-tests.sh because the url generator no longer looks at the global
+   * from run-tests.sh because the URL generator no longer looks at the global
    * variables that are set there but relies on getting this information from a
    * request object.
    *
diff --git a/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php b/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php
index 06653f6..4702385 100644
--- a/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php
+++ b/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php
@@ -74,7 +74,7 @@ public function testGetInvalidArgumentExceptionInUrlConversion($url, $root) {
    *
    * @return array
    *   Array of arrays with the following elements:
-   *   - An invalid Url string.
+   *   - An invalid URL string.
    *   - Drupal root string.
    */
   public function providerInvalidArgumentsUrlConversion() {
diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php b/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
index 5537046..99cb180 100644
--- a/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
@@ -11,7 +11,7 @@
 /**
  * Defines a base unit test for testing existence of local tasks.
  *
- * @todo Add tests for access checking and url building,
+ * @todo Add tests for access checking and URL building,
  *   https://www.drupal.org/node/2112245.
  */
 abstract class LocalTaskIntegrationTestBase extends UnitTestCase {
diff --git a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
index da25831..ab4aa0a 100644
--- a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
@@ -34,7 +34,7 @@ class UrlGeneratorTest extends UnitTestCase {
   protected $provider;
 
   /**
-   * The url generator to test.
+   * The URL generator to test.
    *
    * @var \Drupal\Core\Routing\UrlGenerator
    */
diff --git a/core/tests/Drupal/Tests/Core/UrlTest.php b/core/tests/Drupal/Tests/Core/UrlTest.php
index 5324c26..69dbb31 100644
--- a/core/tests/Drupal/Tests/Core/UrlTest.php
+++ b/core/tests/Drupal/Tests/Core/UrlTest.php
@@ -118,7 +118,7 @@ protected function setUp() {
   }
 
   /**
-   * Tests creating a Url from a request.
+   * Tests creating a URL from a request.
    */
   public function testUrlFromRequest() {
     $this->router->expects($this->at(0))
@@ -311,7 +311,7 @@ public function testIsExternal($urls) {
    * Tests the getUri() method for internal URLs.
    *
    * @param \Drupal\Core\Url[] $urls
-   *   Array of URL objects.
+   *   Array of Url objects.
    *
    * @depends testUrlFromRequest
    *
@@ -351,7 +351,7 @@ public function testGetUriForProtocolRelativeUrl() {
    * Tests the getInternalPath method().
    *
    * @param \Drupal\Core\Url[] $urls
-   *   Array of URL objects.
+   *   Array of Url objects.
    *
    * @covers ::getInternalPath
    *
@@ -364,7 +364,7 @@ public function testGetInternalPath($urls) {
     $map[] = ['node_edit', ['node' => '2'], '/node/2/edit'];
 
     foreach ($urls as $index => $url) {
-      // Clone the url so that there is no leak of internal state into the
+      // Clone the URL so that there is no leak of internal state into the
       // other ones.
       $url = clone $url;
       $url_generator = $this->getMock('Drupal\Core\Routing\UrlGeneratorInterface');