diff --git a/core/authorize.php b/core/authorize.php
index 114dcd3..32d765c 100644
--- a/core/authorize.php
+++ b/core/authorize.php
@@ -80,9 +80,9 @@ function authorize_access_allowed() {
 // display errors via the maintenance theme.
 $module_list['system'] = 'core/modules/system/system.module';
 $module_list['user'] = 'core/modules/user/user.module';
-drupal_container()->get('module_handler')->setModuleList($module_list);
-drupal_container()->get('module_handler')->load('system');
-drupal_container()->get('module_handler')->load('user');
+Drupal::service('module_handler')->setModuleList($module_list);
+Drupal::service('module_handler')->load('system');
+Drupal::service('module_handler')->load('user');
 
 // Initialize the language system.
 drupal_language_initialize();
diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index a3a0f46..5c89480 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -890,10 +890,10 @@ function drupal_get_filename($type, $name, $filename = NULL) {
     // Verify that we have an keyvalue service before using it. This is required
     // because this function is called during installation.
     // @todo Inject database connection into KeyValueStore\DatabaseStorage.
-    if (($container = drupal_container()) && $container->has('keyvalue') && function_exists('db_query')) {
+    if (($container = Drupal::getContainer()) && $container->has('keyvalue') && function_exists('db_query')) {
       if ($type == 'module') {
         if (empty($files[$type])) {
-          $files[$type] = drupal_container()->get('module_handler')->getModuleList();
+          $files[$type] = Drupal::service('module_handler')->getModuleList();
         }
         if (isset($files[$type][$name])) {
           return $files[$type][$name];
@@ -1141,7 +1141,7 @@ function drupal_page_is_cacheable($allow_caching = NULL) {
  * @see bootstrap_hooks()
  */
 function bootstrap_invoke_all($hook) {
-  $module_handler = drupal_container()->get('module_handler');
+  $module_handler = Drupal::service('module_handler');
   foreach ($module_handler->getBootstrapModules() as $module) {
     $module_handler->load($module);
     module_invoke($module, $hook);
@@ -1162,8 +1162,8 @@ function bootstrap_invoke_all($hook) {
  *   TRUE if the item is loaded or has already been loaded.
  */
 function drupal_load($type, $name) {
-  if ($type == 'module' && drupal_container()->get('module_handler')->moduleExists($name)) {
-    return drupal_container()->get('module_handler')->load($name);
+  if ($type == 'module' && Drupal::service('module_handler')->moduleExists($name)) {
+    return Drupal::service('module_handler')->load($name);
   }
 
   // Once a file is included this can't be reversed during a request so do not
@@ -2305,9 +2305,9 @@ function _drupal_bootstrap_configuration() {
  * Initialize the kernel / service container.
  */
 function _drupal_bootstrap_kernel() {
-  // Normally, index.php puts a container in drupal_container() by creating a
+  // Normally, index.php puts a container in Drupal::getContainer() by creating a
   // kernel. If there is no container yet, create one.
-  if (!drupal_container()) {
+  if (!Drupal::getContainer()) {
     $kernel = new DrupalKernel('prod', FALSE, drupal_classloader());
     $kernel->boot();
   }
@@ -2411,7 +2411,7 @@ function _drupal_bootstrap_variables() {
   $conf = variable_initialize(isset($conf) ? $conf : array());
   // Load bootstrap modules.
   require_once DRUPAL_ROOT . '/core/includes/module.inc';
-  drupal_container()->get('module_handler')->loadBootstrapModules();
+  Drupal::service('module_handler')->loadBootstrapModules();
 }
 
 /**
@@ -2426,29 +2426,15 @@ function drupal_get_bootstrap_phase() {
 }
 
 /**
- * Retrieves the Drupal Container to standardize object construction.
- *
- * @deprecated This function has been replaced by the \Drupal class. Use that
- *   instead.
- *
- * @return Symfony\Component\DependencyInjection\ContainerInterface|bool
- *   The instance of the ContainerInterface used to set up and maintain
- *   object instances or FALSE if none exist yet.
- */
-function drupal_container() {
-  return Drupal::getContainer();
-}
-
-/**
  * Returns the list of enabled modules.
  *
  * @deprecated as of Drupal 8.0. Use
- *   drupal_container()->get('module_handler')->getModuleList().
+ *   Drupal::service('module_handler')->getModuleList().
  *
  * @see \Drupal\Core\Extension\ModuleHandler::getModuleList()
  */
 function module_list() {
-  $modules = array_keys(drupal_container()->get('module_handler')->getModuleList());
+  $modules = array_keys(Drupal::service('module_handler')->getModuleList());
   return array_combine($modules, $modules);
 }
 
@@ -2456,19 +2442,19 @@ function module_list() {
  * Determines which modules are implementing a hook.
  *
  * @deprecated as of Drupal 8.0. Use
- *   drupal_container()->get('module_handler')->getImplementations($hook).
+ *   Drupal::service('module_handler')->getImplementations($hook).
  *
  * @see \Drupal\Core\Extension\ModuleHandler::getImplementations()
  */
 function module_implements($hook) {
-  return drupal_container()->get('module_handler')->getImplementations($hook);
+  return Drupal::service('module_handler')->getImplementations($hook);
 }
 
 /**
  * Invokes a hook in a particular module.
  *
  * @deprecated as of Drupal 8.0. Use
- *   drupal_container()->get('module_handler')->invoke($module, $hook, $args = array()).
+ *   Drupal::service('module_handler')->invoke($module, $hook, $args = array()).
  *
  * @see \Drupal\Core\Extension\ModuleHandler::invoke()
  */
@@ -2476,14 +2462,14 @@ function module_invoke($module, $hook) {
   $args = func_get_args();
   // Remove $module and $hook from the arguments.
   unset($args[0], $args[1]);
-  return drupal_container()->get('module_handler')->invoke($module, $hook, $args);
+  return Drupal::service('module_handler')->invoke($module, $hook, $args);
 }
 
 /**
  * Invokes a hook in all enabled modules that implement it.
  *
  * @deprecated as of Drupal 8.0. Use
- *   drupal_container()->get('module_handler')->invokeAll($hook).
+ *   Drupal::service('module_handler')->invokeAll($hook).
  *
  * @see \Drupal\Core\Extension\ModuleHandler::invokeAll()
  */
@@ -2491,43 +2477,43 @@ function module_invoke_all($hook) {
   $args = func_get_args();
   // Remove $hook from the arguments.
   array_shift($args);
-  return drupal_container()->get('module_handler')->invokeAll($hook, $args);
+  return Drupal::service('module_handler')->invokeAll($hook, $args);
 }
 
 /**
  * Passes alterable variables to specific hook_TYPE_alter() implementations.
  *
  * @deprecated as of Drupal 8.0. Use
- *   drupal_container()->get('module_handler')->alter($hook).
+ *   Drupal::service('module_handler')->alter($hook).
  *
  * @see \Drupal\Core\Extension\ModuleHandler::alter()
  */
 function drupal_alter($type, &$data, &$context1 = NULL, &$context2 = NULL) {
-  return drupal_container()->get('module_handler')->alter($type, $data, $context1, $context2);
+  return Drupal::service('module_handler')->alter($type, $data, $context1, $context2);
 }
 
 /**
  * Determines whether a given module exists.
  *
  * @deprecated as of Drupal 8.0. Use
- *   drupal_container()->get('module_handler')->moduleExists($hook).
+ *   Drupal::service('module_handler')->moduleExists($hook).
  *
  * @see \Drupal\Core\Extension\ModuleHandler::moduleExists()
  */
 function module_exists($module) {
-  return drupal_container()->get('module_handler')->moduleExists($module);
+  return Drupal::service('module_handler')->moduleExists($module);
 }
 
 /**
  * Determines whether a module implements a hook.
  *
  * @deprecated as of Drupal 8.0. Use
- *   drupal_container()->get('module_handler')->implementsHook($module, $hook).
+ *   Drupal::service('module_handler')->implementsHook($module, $hook).
  *
  * @see \Drupal\Core\Extension\ModuleHandler::implementsHook()
  */
 function module_hook($module, $hook) {
-  return drupal_container()->get('module_handler')->implementsHook($module, $hook);
+  return Drupal::service('module_handler')->implementsHook($module, $hook);
 }
 
 /**
@@ -2542,7 +2528,7 @@ function module_hook($module, $hook) {
  * @return Drupal\Core\KeyValueStore\KeyValueStoreInterface
  */
 function state() {
-  return drupal_container()->get('keyvalue')->get('state');
+  return Drupal::service('keyvalue')->get('state');
 }
 
 /**
@@ -2561,7 +2547,7 @@ function typed_data() {
     $drupal_static_fast['manager'] = &drupal_static(__FUNCTION__);
   }
   if (!isset($drupal_static_fast['manager'])) {
-    $drupal_static_fast['manager'] = drupal_container()->get('typed_data');
+    $drupal_static_fast['manager'] = Drupal::service('typed_data');
   }
   return $drupal_static_fast['manager'];
 }
@@ -2695,7 +2681,7 @@ function get_t() {
  * @see language()
  */
 function drupal_language_initialize() {
-  drupal_container()->get('language_manager')->init();
+  Drupal::service('language_manager')->init();
 }
 
 /**
@@ -2707,7 +2693,7 @@ function drupal_language_initialize() {
  *   The type of language object needed, e.g. LANGUAGE_TYPE_INTERFACE.
  */
 function language($type) {
-  $container = drupal_container();
+  $container = Drupal::getContainer();
   if (!$container) {
     return language_default();
   }
diff --git a/core/includes/common.inc b/core/includes/common.inc
index 88d6fd3..c82928b 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -2124,7 +2124,7 @@ function url($path = NULL, array $options = array()) {
   }
   elseif (!empty($path) && !$options['alias']) {
     $langcode = isset($options['language']) && isset($options['language']->langcode) ? $options['language']->langcode : '';
-    $alias = drupal_container()->get('path.alias_manager')->getPathAlias($original_path, $langcode);
+    $alias = Drupal::service('path.alias_manager')->getPathAlias($original_path, $langcode);
     if ($alias != $original_path) {
       $path = $alias;
     }
@@ -2247,7 +2247,7 @@ function l($text, $path, array $options = array()) {
   // (e.g., pagers).
   $is_active = ($path == current_path() || ($path == '<front>' && drupal_is_front_page()));
   $is_active = $is_active && (empty($options['language']) || $options['language']->langcode == language(LANGUAGE_TYPE_URL)->langcode);
-  $is_active = $is_active && (drupal_container()->get('request')->query->all() == $options['query']);
+  $is_active = $is_active && (Drupal::service('request')->query->all() == $options['query']);
   if ($is_active) {
     $options['attributes']['class'][] = 'active';
   }
@@ -3840,7 +3840,7 @@ function drupal_get_js($scope = 'header', $javascript = NULL, $skip_alter = FALS
     // Don't add settings if there is no other JavaScript on the page, unless
     // this is an AJAX request.
     // @todo Clean up container call.
-    $container = drupal_container();
+    $container = Drupal::getContainer();
     if ($container->has('content_negotiation') && $container->isScopeActive('request')) {
       $type = $container->get('content_negotiation')->getContentType($container->get('request'));
     }
@@ -4877,7 +4877,7 @@ function _drupal_bootstrap_code() {
   require_once DRUPAL_ROOT . '/core/includes/entity.inc';
 
   // Load all enabled modules
-  drupal_container()->get('module_handler')->loadAll();
+  Drupal::service('module_handler')->loadAll();
 
   // Make sure all stream wrappers are registered.
   file_get_stream_wrappers();
@@ -6378,7 +6378,7 @@ function drupal_flush_all_caches() {
 
   // Clear all non-drupal_static() static caches.
   // @todo Rebuild the kernel/container.
-  drupal_container()->get('plugin.manager.entity')->clearCachedDefinitions();
+  Drupal::service('plugin.manager.entity')->clearCachedDefinitions();
 
   // Rebuild module and theme data.
   system_rebuild_module_data();
@@ -6386,7 +6386,7 @@ function drupal_flush_all_caches() {
 
   // Ensure that all modules that are currently supposed to be enabled are
   // actually loaded.
-  drupal_container()->get('module_handler')->loadAll();
+  Drupal::service('module_handler')->loadAll();
 
   // Update the list of bootstrap modules.
   // Allows developers to get new bootstrap hooks implementations registered
@@ -6407,7 +6407,7 @@ function drupal_flush_all_caches() {
   // Rebuild the menu router based on all rebuilt data.
   // Important: This rebuild must happen last, so the menu router is guaranteed
   // to be based on up to date information.
-  drupal_container()->get('router.builder')->rebuild();
+  Drupal::service('router.builder')->rebuild();
   menu_router_rebuild();
 
   // Wipe the PHP Storage caches.
@@ -6684,7 +6684,7 @@ function drupal_get_filetransfer_info() {
  * @see Drupal\Core\Queue\QueueInterface
  */
 function queue($name, $reliable = FALSE) {
-  return drupal_container()->get('queue')->get($name, $reliable);
+  return Drupal::service('queue')->get($name, $reliable);
 }
 
 /**
diff --git a/core/includes/config.inc b/core/includes/config.inc
index 3591263..f7708c7 100644
--- a/core/includes/config.inc
+++ b/core/includes/config.inc
@@ -37,7 +37,7 @@ function config_install_default_config($type, $name) {
   $config_dir = drupal_get_path($type, $name) . '/config';
   if (is_dir($config_dir)) {
     $source_storage = new FileStorage($config_dir);
-    $target_storage = drupal_container()->get('config.storage');
+    $target_storage = Drupal::service('config.storage');
 
     // Ignore manifest files.
     $config_changes = config_sync_get_changes($source_storage, $target_storage, FALSE);
@@ -64,7 +64,7 @@ function config_install_default_config($type, $name) {
  *   The name of the module or theme to install default configuration for.
  */
 function config_uninstall_default_config($type, $name) {
-  $storage = drupal_container()->get('config.storage');
+  $storage = Drupal::service('config.storage');
   $config_names = $storage->listAll($name . '.');
   foreach ($config_names as $config_name) {
     config($config_name)->delete();
@@ -83,7 +83,7 @@ function config_uninstall_default_config($type, $name) {
  * @see Drupal\Core\Config\StorageInterface::listAll()
  */
 function config_get_storage_names_with_prefix($prefix = '') {
-  return drupal_container()->get('config.storage')->listAll($prefix);
+  return Drupal::service('config.storage')->listAll($prefix);
 }
 
 /**
@@ -102,7 +102,7 @@ function config_get_storage_names_with_prefix($prefix = '') {
  *   A configuration object.
  */
 function config($name) {
-  return drupal_container()->get('config.factory')->get($name);
+  return Drupal::service('config.factory')->get($name);
 }
 
 /**
@@ -124,18 +124,18 @@ function config($name) {
  *   The configuration context object.
  */
 function config_context_enter($context_name) {
-  if (drupal_container()->has($context_name)) {
-    $context = drupal_container()->get($context_name);
+  if (Drupal::getContainer()->has($context_name)) {
+    $context = Drupal::getContainer()->get($context_name);
   }
   elseif (class_exists($context_name) && in_array('Drupal\Core\Config\Context\ContextInterface', class_implements($context_name))) {
-    $context = drupal_container()
+    $context = Drupal::getContainer()
       ->get('config.context.factory')
       ->get($context_name);
   }
   else {
     throw new ConfigException(sprintf('Unknown config context service or class: %s', $context_name));
   }
-  drupal_container()
+  Drupal::getContainer()
     ->get('config.factory')
     ->enterContext($context);
   return $context;
@@ -148,7 +148,7 @@ function config_context_enter($context_name) {
  * @see \Drupal\Core\Config\ConfigFactory
  */
 function config_context_leave() {
-  drupal_container()
+  Drupal::getContainer()
     ->get('config.factory')
     ->leaveContext();
 }
@@ -238,8 +238,8 @@ function config_sync_get_changes(StorageInterface $source_storage, StorageInterf
  *   The storage to synchronize configuration to.
  */
 function config_sync_changes(array $config_changes, StorageInterface $source_storage, StorageInterface $target_storage) {
-  $target_context = drupal_container()->get('config.context.free');
-  $factory = drupal_container()->get('config.factory');
+  $target_context = Drupal::service('config.context.free');
+  $factory = Drupal::service('config.factory');
   foreach (array('delete', 'create', 'change') as $op) {
     foreach ($config_changes[$op] as $name) {
       $config = new Config($name, $target_storage, $target_context);
@@ -265,9 +265,9 @@ function config_sync_changes(array $config_changes, StorageInterface $source_sto
  */
 function config_import() {
   // Retrieve a list of differences between staging and the active configuration.
-  $source_storage = drupal_container()->get('config.storage.staging');
-  $snapshot_storage = drupal_container()->get('config.storage.snapshot');
-  $target_storage = drupal_container()->get('config.storage');
+  $source_storage = Drupal::service('config.storage.staging');
+  $snapshot_storage = Drupal::service('config.storage.snapshot');
+  $target_storage = Drupal::service('config.storage');
 
   $config_changes = config_sync_get_changes($source_storage, $target_storage);
   if (empty($config_changes)) {
@@ -333,15 +333,15 @@ function config_import_create_snapshot(StorageInterface $source_storage, Storage
  * @todo Add support for other extension types; e.g., themes etc.
  */
 function config_import_invoke_owner(array $config_changes, StorageInterface $source_storage, StorageInterface $target_storage) {
-  $factory = drupal_container()->get('config.factory');
+  $factory = Drupal::service('config.factory');
   // Use the admin context for config importing so that any overrides do not
   // change the data on import.
-  $free_context = drupal_container()->get('config.context.free');
+  $free_context = Drupal::service('config.context.free');
   // Allow modules to take over configuration change operations for
   // higher-level configuration data.
   // First pass deleted, then new, and lastly changed configuration, in order to
   // handle dependencies correctly.
-  $manager = drupal_container()->get('plugin.manager.entity');
+  $manager = Drupal::service('plugin.manager.entity');
   foreach (array('delete', 'create', 'change') as $op) {
     foreach ($config_changes[$op] as $key => $name) {
       // Call to the configuration entity's storage controller to handle the
@@ -365,7 +365,7 @@ function config_import_invoke_owner(array $config_changes, StorageInterface $sou
       if (!empty($handled_by_module)) {
         $factory->reset($name);
         // Reset the manifest config object for the config entity.
-        $entity_info = drupal_container()->get('plugin.manager.entity')->getDefinition($entity_type);
+        $entity_info = Drupal::service('plugin.manager.entity')->getDefinition($entity_type);
         $factory->reset('manifest.' . $entity_info['config_prefix']);
         unset($config_changes[$op][$key]);
       }
@@ -420,5 +420,5 @@ function config_get_entity_type_by_name($name) {
  * @return Drupal\Core\TypedData\TypedConfigManager
  */
 function config_typed() {
-  return drupal_container()->get('config.typed');
+  return Drupal::service('config.typed');
 }
diff --git a/core/includes/entity.inc b/core/includes/entity.inc
index 708706e..26c8a44 100644
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@ -28,10 +28,10 @@
  */
 function entity_get_info($entity_type = NULL) {
   if (empty($entity_type)) {
-    return drupal_container()->get('plugin.manager.entity')->getDefinitions();
+    return Drupal::service('plugin.manager.entity')->getDefinitions();
   }
   else {
-    return drupal_container()->get('plugin.manager.entity')->getDefinition($entity_type);
+    return Drupal::service('plugin.manager.entity')->getDefinition($entity_type);
   }
 }
 
@@ -42,7 +42,7 @@ function entity_info_cache_clear() {
   drupal_static_reset('entity_get_view_modes');
   drupal_static_reset('entity_get_bundles');
   // Clear all languages.
-  drupal_container()->get('plugin.manager.entity')->clearCachedDefinitions();
+  Drupal::service('plugin.manager.entity')->clearCachedDefinitions();
 }
 
 /**
@@ -167,7 +167,7 @@ function entity_load($entity_type, $id, $reset = FALSE) {
  * @see Drupal\Core\Entity\DatabaseStorageController
  */
 function entity_revision_load($entity_type, $revision_id) {
-  return drupal_container()->get('plugin.manager.entity')
+  return Drupal::service('plugin.manager.entity')
     ->getStorageController($entity_type)
     ->loadRevision($revision_id);
 }
@@ -181,7 +181,7 @@ function entity_revision_load($entity_type, $revision_id) {
  *   The revision ID to delete.
  */
 function entity_revision_delete($entity_type, $revision_id) {
-  drupal_container()->get('plugin.manager.entity')
+  Drupal::service('plugin.manager.entity')
     ->getStorageController($entity_type)
     ->deleteRevision($revision_id);
 }
@@ -213,7 +213,7 @@ function entity_load_by_uuid($entity_type, $uuid, $reset = FALSE) {
   }
   $uuid_key = $entity_info['entity_keys']['uuid'];
 
-  $controller = drupal_container()->get('plugin.manager.entity')->getStorageController($entity_type);
+  $controller = Drupal::service('plugin.manager.entity')->getStorageController($entity_type);
   if ($reset) {
     $controller->resetCache();
   }
@@ -255,7 +255,7 @@ function entity_load_by_uuid($entity_type, $uuid, $reset = FALSE) {
  * @see Drupal\Core\Entity\Query\QueryInterface
  */
 function entity_load_multiple($entity_type, array $ids = NULL, $reset = FALSE) {
-  $controller = drupal_container()->get('plugin.manager.entity')->getStorageController($entity_type);
+  $controller = Drupal::service('plugin.manager.entity')->getStorageController($entity_type);
   if ($reset) {
     $controller->resetCache();
   }
@@ -275,7 +275,7 @@ function entity_load_multiple($entity_type, array $ids = NULL, $reset = FALSE) {
  *   An array of entity objects indexed by their ids.
  */
 function entity_load_multiple_by_properties($entity_type, array $values) {
-  return drupal_container()->get('plugin.manager.entity')
+  return Drupal::service('plugin.manager.entity')
     ->getStorageController($entity_type)
     ->loadByProperties($values);
 }
@@ -297,7 +297,7 @@ function entity_load_multiple_by_properties($entity_type, array $values) {
  *   The unchanged entity, or FALSE if the entity cannot be loaded.
  */
 function entity_load_unchanged($entity_type, $id) {
-  return drupal_container()->get('plugin.manager.entity')
+  return Drupal::service('plugin.manager.entity')
     ->getStorageController($entity_type)
     ->loadUnchanged($id);
 }
@@ -311,7 +311,7 @@ function entity_load_unchanged($entity_type, $id) {
  *   An array of entity IDs of the entities to delete.
  */
 function entity_delete_multiple($entity_type, array $ids) {
-  $controller = drupal_container()->get('plugin.manager.entity')->getStorageController($entity_type);
+  $controller = Drupal::service('plugin.manager.entity')->getStorageController($entity_type);
   $entities = $controller->load($ids);
   $controller->delete($entities);
 }
@@ -329,7 +329,7 @@ function entity_delete_multiple($entity_type, array $ids) {
  *   A new entity object.
  */
 function entity_create($entity_type, array $values) {
-  return drupal_container()->get('plugin.manager.entity')
+  return Drupal::service('plugin.manager.entity')
     ->getStorageController($entity_type)
     ->create($values);
 }
@@ -342,7 +342,7 @@ function entity_create($entity_type, array $values) {
  * @deprecated Use \Drupal\Core\Entity\EntityManager::getStorageController().
  */
 function entity_get_controller($entity_type) {
-  return drupal_container()->get('plugin.manager.entity')
+  return Drupal::service('plugin.manager.entity')
     ->getStorageController($entity_type);
 }
 
@@ -380,7 +380,7 @@ function entity_page_label(EntityInterface $entity, $langcode = NULL) {
  * @deprecated Use \Drupal\Core\Entity\EntityManager::getRenderController().
  */
 function entity_access_controller($entity_type) {
-  return drupal_container()->get('plugin.manager.entity')
+  return Drupal::service('plugin.manager.entity')
     ->getAccessController($entity_type);
 }
 
@@ -408,7 +408,7 @@ function entity_access_controller($entity_type) {
  * @deprecated Use \Drupal\Core\Entity\EntityManager::getFormController().
  */
 function entity_form_controller($entity_type, $operation = 'default') {
-  return drupal_container()->get('plugin.manager.entity')
+  return Drupal::service('plugin.manager.entity')
     ->getFormController($entity_type, $operation);
 }
 
@@ -449,7 +449,7 @@ function entity_form_id(EntityInterface $entity, $operation = 'default') {
  */
 function entity_form_state_defaults(EntityInterface $entity, $operation = 'default') {
   $form_state = array();
-  $controller = drupal_container()->get('plugin.manager.entity')->getFormController($entity->entityType(), $operation);
+  $controller = Drupal::service('plugin.manager.entity')->getFormController($entity->entityType(), $operation);
   $form_state['build_info']['callback'] = array($controller, 'build');
   $form_state['build_info']['base_form_id'] = $entity->entityType() . '_form';
   $form_state['build_info']['args'] = array($entity);
@@ -557,7 +557,7 @@ function entity_form_submit_build_entity($entity_type, $entity, $form, &$form_st
  * @deprecated Use \Drupal\Core\Entity\EntityManager::getFormController().
  */
 function entity_list_controller($entity_type) {
-  return drupal_container()->get('plugin.manager.entity')
+  return Drupal::service('plugin.manager.entity')
     ->getListController($entity_type);
 }
 
@@ -573,7 +573,7 @@ function entity_list_controller($entity_type) {
  * @deprecated Use \Drupal\Core\Entity\EntityManager::getFormController().
  */
 function entity_render_controller($entity_type) {
-  return drupal_container()->get('plugin.manager.entity')
+  return Drupal::service('plugin.manager.entity')
     ->getRenderController($entity_type);
 }
 
@@ -592,7 +592,7 @@ function entity_render_controller($entity_type) {
  *   A render array for the entity.
  */
 function entity_view(EntityInterface $entity, $view_mode, $langcode = NULL) {
-  return drupal_container()->get('plugin.manager.entity')
+  return Drupal::service('plugin.manager.entity')
     ->getRenderController($entity->entityType())
     ->view($entity, $view_mode, $langcode);
 }
@@ -613,7 +613,7 @@ function entity_view(EntityInterface $entity, $view_mode, $langcode = NULL) {
  *   entities array passed in $entities.
  */
 function entity_view_multiple(array $entities, $view_mode, $langcode = NULL) {
-  return drupal_container()->get('plugin.manager.entity')
+  return Drupal::service('plugin.manager.entity')
     ->getRenderController(reset($entities)->entityType())
     ->viewMultiple($entities, $view_mode, $langcode);
 }
@@ -731,7 +731,7 @@ function entity_get_render_display(EntityInterface $entity, $view_mode) {
  *   The query object that can query the given entity type.
  */
 function entity_query($entity_type, $conjunction = 'AND') {
-  return drupal_container()->get('entity.query')->get($entity_type, $conjunction);
+  return Drupal::service('entity.query')->get($entity_type, $conjunction);
 }
 
 /**
@@ -748,7 +748,7 @@ function entity_query($entity_type, $conjunction = 'AND') {
  *   The query object that can query the given entity type.
  */
 function entity_query_aggregate($entity_type, $conjunction = 'AND') {
-  return drupal_container()->get('entity.query')->getAggregate($entity_type, $conjunction);
+  return Drupal::service('entity.query')->getAggregate($entity_type, $conjunction);
 }
 
 /**
@@ -779,7 +779,7 @@ function entity_page_access(EntityInterface $entity, $operation = 'view') {
  *   TRUE if the access is granted. FALSE if access is denied.
  */
 function entity_page_create_access($entity_type) {
-  $entity = drupal_container()->get('plugin.manager.entity')
+  $entity = Drupal::service('plugin.manager.entity')
     ->getStorageController($entity_type)
     ->create(array());
   return $entity->access('create');
diff --git a/core/includes/form.inc b/core/includes/form.inc
index 3ebaca1..2a6c64f 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -1323,7 +1323,7 @@ function drupal_redirect_form($form_state) {
         $function($form_state['redirect']);
       }
     }
-    drupal_goto(current_path(), array('query' => drupal_container()->get('request')->query->all()));
+    drupal_goto(current_path(), array('query' => Drupal::service('request')->query->all()));
   }
 }
 
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index e2e8c27..2d750e3 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -304,7 +304,7 @@ function install_begin_request(&$install_state) {
 
   // If it is not, replace the configuration storage with the InstallStorage
   // implementation, for the following reasons:
-  // - The first call into drupal_container() will try to set up the regular
+  // - The first call into Drupal::getContainer() will try to set up the regular
   //   runtime configuration storage, using the CachedStorage by default. It
   //   calls config_get_config_directory() to retrieve the config directory to
   //   use, but that throws an exception, since $config_directories is not
@@ -382,7 +382,7 @@ function install_begin_request(&$install_state) {
 
   require_once DRUPAL_ROOT . '/core/includes/ajax.inc';
 
-  $module_handler = drupal_container()->get('module_handler');
+  $module_handler = Drupal::service('module_handler');
   if (!$module_handler->moduleExists('system')) {
     // Override the module list with a minimal set of modules.
     $module_handler->setModuleList(array('system' => 'core/modules/system/system.module'));
@@ -1510,7 +1510,7 @@ function install_retrieve_file($uri, $destination) {
   }
 
   try {
-    $request = drupal_container()->get('http_default_client')->get($uri, array('Accept' => 'text/plain'));
+    $request = Drupal::service('http_default_client')->get($uri, array('Accept' => 'text/plain'));
     $data = $request->send()->getBody(TRUE);
     if (empty($data)) {
       return FALSE;
@@ -1533,7 +1533,7 @@ function install_retrieve_file($uri, $destination) {
  */
 function install_check_localization_server($uri) {
   try {
-    $request = drupal_container()->get('http_default_client')->head($uri);
+    $request = Drupal::service('http_default_client')->head($uri);
     $response = $request->send();
     return TRUE;
   }
@@ -1863,8 +1863,8 @@ function install_finished(&$install_state) {
   drupal_cron_run();
 
   // Save a snapshot of the intially installed configuration.
-  $active = drupal_container()->get('config.storage');
-  $snapshot = drupal_container()->get('config.storage.snapshot');
+  $active = Drupal::service('config.storage');
+  $snapshot = Drupal::service('config.storage.snapshot');
   config_import_create_snapshot($active, $snapshot);
 
   return $output;
diff --git a/core/includes/install.inc b/core/includes/install.inc
index 088413a..3f0ba5a 100644
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -417,7 +417,7 @@ function drupal_install_system() {
   require_once DRUPAL_ROOT . '/' . $system_path . '/system.install';
   $system_versions = drupal_get_schema_versions('system');
   $system_version = $system_versions ? max($system_versions) : SCHEMA_INSTALLED;
-  drupal_container()
+  Drupal::getContainer()
     ->get('keyvalue')
     ->get('system.schema')
     ->set('system', $system_version);
@@ -431,7 +431,7 @@ function drupal_install_system() {
     ->save();
 
   // Update the module list to include it.
-  drupal_container()->get('module_handler')->setModuleList(array('system' => $system_path . '/system.module'));
+  Drupal::service('module_handler')->setModuleList(array('system' => $system_path . '/system.module'));
 
   config_install_default_config('module', 'system');
 
diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index d719571..90d03d4 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -900,7 +900,7 @@ function _menu_link_translate(&$item, $translate = FALSE) {
     if (!isset($item['access'])) {
       if ($route = $item->getRoute()) {
         $request = Request::create('/' . $item['path']);
-        $item['access'] = drupal_container()->get('access_manager')->check($route, $request);
+        $item['access'] = Drupal::service('access_manager')->check($route, $request);
       }
       elseif (!empty($item['load_functions']) && !_menu_load_objects($item, $map)) {
         // An error occurred loading an object.
@@ -2047,7 +2047,7 @@ function menu_local_tasks($level = 0) {
     $data['tabs'] = $tabs;
 
     // Allow modules to dynamically add further tasks.
-    $module_handler = drupal_container()->get('module_handler');
+    $module_handler = Drupal::service('module_handler');
     foreach ($module_handler->getImplementations('menu_local_tasks') as $module) {
       $function = $module . '_menu_local_tasks';
       $function($data, $router_item, $root_path);
@@ -2587,7 +2587,7 @@ function menu_cache_clear_all() {
  * Resets the menu system static cache.
  */
 function menu_reset_static_cache() {
-  drupal_container()->get('plugin.manager.entity')
+  Drupal::service('plugin.manager.entity')
     ->getStorageController('menu_link')->resetCache();
   drupal_static_reset('_menu_build_tree');
   drupal_static_reset('menu_tree');
@@ -2687,7 +2687,7 @@ function menu_router_build() {
 function _menu_router_merge_route(array $router_item, $path) {
   $router_item['path'] = $path;
 
-  $route_provider = drupal_container()->get('router.route_provider');
+  $route_provider = Drupal::service('router.route_provider');
 
   $route = $route_provider->getRouteByName($router_item['route_name']);
   $router_item['path'] = trim($route->getPattern(), '/');
@@ -2730,7 +2730,7 @@ function menu_get_router() {
  */
 function _menu_navigation_links_rebuild($menu) {
   if (module_exists('menu_link')) {
-    $menu_link_controller = drupal_container()->get('plugin.manager.entity')
+    $menu_link_controller = Drupal::service('plugin.manager.entity')
       ->getStorageController('menu_link');
   }
   else {
diff --git a/core/includes/module.inc b/core/includes/module.inc
index 99eac78..fd334d3 100644
--- a/core/includes/module.inc
+++ b/core/includes/module.inc
@@ -284,10 +284,10 @@ function module_enable($module_list, $enable_dependencies = TRUE) {
 
   $modules_installed = array();
   $modules_enabled = array();
-  $schema_store = drupal_container()->get('keyvalue')->get('system.schema');
+  $schema_store = Drupal::service('keyvalue')->get('system.schema');
   $module_config = config('system.module');
   $disabled_config = config('system.module.disabled');
-  $module_handler = drupal_container()->get('module_handler');
+  $module_handler = Drupal::service('module_handler');
   foreach ($module_list as $module) {
     // Only process modules that are not already enabled.
     // A module is only enabled if it is configured as enabled. Custom or
@@ -352,7 +352,7 @@ function module_enable($module_list, $enable_dependencies = TRUE) {
       // taken over as %container.modules% parameter, which is passed to a fresh
       // ModuleHandler instance upon first retrieval.
       // @todo install_begin_request() creates a container without a kernel.
-      if ($kernel = drupal_container()->get('kernel', ContainerInterface::NULL_ON_INVALID_REFERENCE)) {
+      if ($kernel = Drupal::getContainer()->get('kernel', ContainerInterface::NULL_ON_INVALID_REFERENCE)) {
         $kernel->updateModules($module_filenames, $module_filenames);
       }
 
@@ -463,7 +463,7 @@ function module_disable($module_list, $disable_dependents = TRUE) {
 
   $module_config = config('system.module');
   $disabled_config = config('system.module.disabled');
-  $module_handler = drupal_container()->get('module_handler');
+  $module_handler = Drupal::service('module_handler');
   foreach ($module_list as $module) {
     // Only process modules that are enabled.
     // A module is only enabled if it is configured as enabled. Custom or
@@ -511,7 +511,7 @@ function module_disable($module_list, $disable_dependents = TRUE) {
 
     // Update the kernel to exclude the disabled modules.
     $enabled = $module_handler->getModuleList();
-    drupal_container()->get('kernel')->updateModules($enabled, $enabled);
+    Drupal::service('kernel')->updateModules($enabled, $enabled);
 
     // Update the theme registry to remove the newly-disabled module.
     drupal_theme_rebuild();
@@ -566,8 +566,8 @@ function module_uninstall($module_list = array(), $uninstall_dependents = TRUE)
     $module_list = array_keys($module_list);
   }
 
-  $storage = drupal_container()->get('config.storage');
-  $schema_store = drupal_container()->get('keyvalue')->get('system.schema');
+  $storage = Drupal::service('config.storage');
+  $schema_store = Drupal::service('keyvalue')->get('system.schema');
   $disabled_config = config('system.module.disabled');
   foreach ($module_list as $module) {
     // Uninstall the module.
@@ -663,7 +663,7 @@ function module_set_weight($module, $weight) {
 
     // Prepare the new module list, sorted by weight, including filenames.
     // @see module_enable()
-    $module_handler = drupal_container()->get('module_handler');
+    $module_handler = Drupal::service('module_handler');
     $current_module_filenames = $module_handler->getModuleList();
     $current_modules = array_fill_keys(array_keys($current_module_filenames), 0);
     $current_modules = module_config_sort(array_merge($current_modules, $module_config->get('enabled')));
diff --git a/core/includes/path.inc b/core/includes/path.inc
index 182c0c8..be6fb12 100644
--- a/core/includes/path.inc
+++ b/core/includes/path.inc
@@ -86,8 +86,8 @@ function current_path() {
   // @todo Remove the check for whether the request service exists and the
   // fallback code below, once the path alias logic has been figured out in
   // http://drupal.org/node/1269742.
-  if (drupal_container()->isScopeActive('request')) {
-    $path = drupal_container()->get('request')->attributes->get('system_path');
+  if (Drupal::getContainer()->isScopeActive('request')) {
+    $path = Drupal::service('request')->attributes->get('system_path');
     if ($path !== NULL) {
       return $path;
     }
@@ -116,7 +116,7 @@ function path_load($conditions) {
   elseif (!is_array($conditions)) {
     return FALSE;
   }
-  return drupal_container()->get('path.crud')->load($conditions);
+  return Drupal::service('path.crud')->load($conditions);
 }
 
 /**
@@ -241,7 +241,7 @@ function _drupal_valid_path_new_router($path) {
   $request = Request::create('/' . $path);
   $request->attributes->set('system_path', $path);
   try {
-    $dc = drupal_container();
+    $dc = Drupal::getContainer();
     $route = $dc->get('router.dynamic')->matchRequest($request);
     if (!empty($route)) {
       $dc->get('access_manager')->check($route['_route_object'], $request);
diff --git a/core/includes/schema.inc b/core/includes/schema.inc
index e599923..1fe59b4 100644
--- a/core/includes/schema.inc
+++ b/core/includes/schema.inc
@@ -77,7 +77,7 @@ function drupal_get_complete_schema($rebuild = FALSE) {
     else {
       $schema = array();
       // Load the .install files to get hook_schema.
-      drupal_container()->get('module_handler')->loadAllIncludes('install');
+      Drupal::service('module_handler')->loadAllIncludes('install');
 
       require_once DRUPAL_ROOT . '/core/includes/common.inc';
       // Invoke hook_schema for all modules.
@@ -121,7 +121,7 @@ function drupal_get_schema_versions($module) {
   $updates = &drupal_static(__FUNCTION__, NULL);
   if (!isset($updates[$module])) {
     $updates = array();
-    foreach (drupal_container()->get('module_handler')->getModuleList() as $loaded_module => $filename) {
+    foreach (Drupal::service('module_handler')->getModuleList() as $loaded_module => $filename) {
       $updates[$loaded_module] = array();
     }
 
@@ -173,7 +173,7 @@ function drupal_get_installed_schema_version($module, $reset = FALSE, $array = F
   }
 
   if (!$versions) {
-    if (!$versions = drupal_container()->get('keyvalue')->get('system.schema')->getAll()) {
+    if (!$versions = Drupal::service('keyvalue')->get('system.schema')->getAll()) {
       $versions = array();
     }
   }
@@ -195,7 +195,7 @@ function drupal_get_installed_schema_version($module, $reset = FALSE, $array = F
  *   The new schema version.
  */
 function drupal_set_installed_schema_version($module, $version) {
-  drupal_container()->get('keyvalue')->get('system.schema')->set($module, $version);
+  Drupal::service('keyvalue')->get('system.schema')->set($module, $version);
   // Reset the static cache of module schema versions.
   drupal_get_installed_schema_version(NULL, TRUE);
 }
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 0edb028..8b83bc1 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -368,14 +368,14 @@ function _theme_load_registry($theme, $base_theme = NULL, $theme_engine = NULL,
       $registry = _theme_build_registry($theme, $base_theme, $theme_engine);
       // Only persist this registry if all modules are loaded. This assures a
       // complete set of theme hooks.
-      if (drupal_container()->get('module_handler')->isLoaded()) {
+      if (Drupal::service('module_handler')->isLoaded()) {
         _theme_save_registry($theme, $registry);
       }
     }
     return $registry;
   }
   else {
-    return new ThemeRegistry('theme_registry:runtime:' . $theme->name, 'cache', array('theme_registry' => TRUE), drupal_container()->get('module_handler')->isLoaded());
+    return new ThemeRegistry('theme_registry:runtime:' . $theme->name, 'cache', array('theme_registry' => TRUE), Drupal::service('module_handler')->isLoaded());
   }
 }
 
@@ -547,7 +547,7 @@ function _theme_process_registry(&$cache, $name, $type, $theme, $path) {
             // Add all modules so they can intervene with their own variable
             // processors. This allows them to provide variable processors even
             // if they are not the owner of the current hook.
-            $prefixes = array_merge($prefixes, array_keys(drupal_container()->get('module_handler')->getModuleList()));
+            $prefixes = array_merge($prefixes, array_keys(Drupal::service('module_handler')->getModuleList()));
           }
           elseif ($type == 'theme_engine' || $type == 'base_theme_engine') {
             // Theme engines get an extra set that come before the normally
@@ -643,7 +643,7 @@ function _theme_build_registry($theme, $base_theme, $theme_engine) {
       _theme_process_registry($cache, $module, 'module', $module, drupal_get_path('module', $module));
     }
     // Only cache this registry if all modules are loaded.
-    if (drupal_container()->get('module_handler')->isLoaded()) {
+    if (Drupal::service('module_handler')->isLoaded()) {
       cache()->set("theme_registry:build:modules", $cache, CacheBackendInterface::CACHE_PERMANENT, array('theme_registry' => TRUE));
     }
   }
@@ -958,7 +958,7 @@ function theme($hook, $variables = array()) {
   // If called before all modules are loaded, we do not necessarily have a full
   // theme registry to work with, and therefore cannot process the theme
   // request properly. See also _theme_load_registry().
-  if (!drupal_container()->get('module_handler')->isLoaded() && !defined('MAINTENANCE_MODE')) {
+  if (!Drupal::service('module_handler')->isLoaded() && !defined('MAINTENANCE_MODE')) {
     throw new Exception(t('theme() may not be called until all modules are loaded.'));
   }
 
diff --git a/core/includes/theme.maintenance.inc b/core/includes/theme.maintenance.inc
index 37775e6..d83131e 100644
--- a/core/includes/theme.maintenance.inc
+++ b/core/includes/theme.maintenance.inc
@@ -56,7 +56,7 @@ function _drupal_maintenance_theme() {
   // Ensure that system.module is loaded.
   if (!function_exists('_system_rebuild_theme_data')) {
     $module_list['system'] = 'core/modules/system/system.module';
-    $module_handler = drupal_container()->get('module_handler');
+    $module_handler = Drupal::service('module_handler');
     $module_handler->setModuleList($module_list);
     $module_handler->load('system');
   }
diff --git a/core/includes/update.inc b/core/includes/update.inc
index bf11562..bd44d1d 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -139,7 +139,7 @@ function update_prepare_d8_bootstrap() {
 
     include_once DRUPAL_ROOT . '/core/includes/module.inc';
     include_once DRUPAL_ROOT . '/core/includes/cache.inc';
-    $module_handler = drupal_container()->get('module_handler');
+    $module_handler = Drupal::service('module_handler');
     $module_handler->setModuleList(array('system' => 'core/modules/system/system.module'));
     $module_handler->load('system');
     // Ensure the configuration directories exist and are writable, or create
@@ -343,7 +343,7 @@ function update_prepare_d8_bootstrap() {
       $disabled_modules = config('system.module.disabled');
       $theme_config = config('system.theme');
       $disabled_themes = config('system.theme.disabled');
-      $schema_store = drupal_container()->get('keyvalue')->get('system.schema');
+      $schema_store = Drupal::service('keyvalue')->get('system.schema');
 
       // Load system.module, because update_prepare_d8_bootstrap() is called in
       // the initial minimal update.php bootstrap that performs the core
@@ -365,7 +365,7 @@ function update_prepare_d8_bootstrap() {
       // Populate a fixed module list (again, why did it get lost?) to avoid
       // errors due to the drupal_alter() in _system_rebuild_module_data().
       $module_list['system'] = 'core/modules/system/system.module';
-      drupal_container()->get('module_handler')->setModuleList($module_list);
+      Drupal::service('module_handler')->setModuleList($module_list);
       $module_data = _system_rebuild_module_data();
 
       // Migrate each extension into configuration, varying by the extension's
@@ -395,7 +395,7 @@ function update_prepare_d8_bootstrap() {
       foreach (array_keys($sorted_modules) as $m) {
         $sorted_with_filenames[$m] = drupal_get_filename('module', $m);
       }
-      drupal_container()->get('module_handler')->setModuleList($sorted_with_filenames);
+      Drupal::service('module_handler')->setModuleList($sorted_with_filenames);
       $disabled_modules->save();
       $theme_config->save();
       $disabled_themes->save();
@@ -663,7 +663,7 @@ function update_fix_d8_requirements() {
  *   if the module was not installed before.
  */
 function update_module_enable(array $modules, $schema_version = 0) {
-  $schema_store = drupal_container()->get('keyvalue')->get('system.schema');
+  $schema_store = Drupal::service('keyvalue')->get('system.schema');
   $old_schema = array();
   foreach ($modules as $module) {
     // Check for initial schema and install it. The schema version of a newly
@@ -1237,7 +1237,7 @@ function update_retrieve_dependencies() {
   $return = array();
   // Get a list of installed modules, arranged so that we invoke their hooks in
   // the same order that module_invoke_all() does.
-  foreach (drupal_container()->get('keyvalue')->get('system.schema')->getAll() as $module => $schema) {
+  foreach (Drupal::service('keyvalue')->get('system.schema')->getAll() as $module => $schema) {
     if ($schema == SCHEMA_UNINSTALLED) {
       // Nothing to upgrade.
       continue;
diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php
index 5b0b502..45e9357 100644
--- a/core/lib/Drupal.php
+++ b/core/lib/Drupal.php
@@ -97,7 +97,7 @@ public static function setContainer(ContainerInterface $container) {
    * Returns the currently active global container.
    *
    * @deprecated This method is only useful for the testing environment, and as
-   *   a BC shiv for drupal_container(). It should not be used otherwise.
+   *   a BC shiv for Drupal::getContainer(). It should not be used otherwise.
    *
    * @return \Symfony\Component\DependencyInjection\ContainerInterface
    */
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
index 92e4be3..48d822b 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
@@ -225,7 +225,7 @@ protected function buildQuery($ids, $revision_id = FALSE) {
 
     // Load all of the configuration entities.
     if ($ids === NULL) {
-      $names = drupal_container()->get('config.storage')->listAll($prefix);
+      $names = Drupal::service('config.storage')->listAll($prefix);
       $result = array();
       foreach ($names as $name) {
         $config = config($name);
@@ -369,7 +369,7 @@ public function save(EntityInterface $entity) {
       // - Storage controller needs to access the original object.
       // - The object needs to be renamed/copied in ConfigFactory and reloaded.
       // - All instances of the object need to be renamed.
-      drupal_container()->get('config.factory')->rename($prefix . $id, $prefix . $entity->id());
+      Drupal::service('config.factory')->rename($prefix . $id, $prefix . $entity->id());
     }
 
     if (!$is_new && !isset($entity->original)) {
diff --git a/core/lib/Drupal/Core/Entity/Entity.php b/core/lib/Drupal/Core/Entity/Entity.php
index fe00ef3..4eb5093 100644
--- a/core/lib/Drupal/Core/Entity/Entity.php
+++ b/core/lib/Drupal/Core/Entity/Entity.php
@@ -258,7 +258,7 @@ public function getIterator() {
    */
   public function access($operation = 'view', \Drupal\user\Plugin\Core\Entity\User $account = NULL) {
     $method = $operation . 'Access';
-    return drupal_container()->get('plugin.manager.entity')
+    return Drupal::service('plugin.manager.entity')
       ->getAccessController($this->entityType)
       ->$method($this, LANGUAGE_DEFAULT, $account);
   }
@@ -331,7 +331,7 @@ public function getTranslationLanguages($include_default = TRUE) {
    * Implements \Drupal\Core\Entity\EntityInterface::save().
    */
   public function save() {
-    return drupal_container()->get('plugin.manager.entity')->getStorageController($this->entityType)->save($this);
+    return Drupal::service('plugin.manager.entity')->getStorageController($this->entityType)->save($this);
   }
 
   /**
@@ -339,7 +339,7 @@ public function save() {
    */
   public function delete() {
     if (!$this->isNew()) {
-      drupal_container()->get('plugin.manager.entity')->getStorageController($this->entityType)->delete(array($this->id() => $this));
+      Drupal::service('plugin.manager.entity')->getStorageController($this->entityType)->delete(array($this->id() => $this));
     }
   }
 
diff --git a/core/lib/Drupal/Core/Entity/EntityNG.php b/core/lib/Drupal/Core/Entity/EntityNG.php
index 8763f6d..acc07ed 100644
--- a/core/lib/Drupal/Core/Entity/EntityNG.php
+++ b/core/lib/Drupal/Core/Entity/EntityNG.php
@@ -218,7 +218,7 @@ public function getPropertyDefinition($name) {
    */
   public function getPropertyDefinitions() {
     if (!isset($this->fieldDefinitions)) {
-      $this->fieldDefinitions = drupal_container()->get('plugin.manager.entity')->getStorageController($this->entityType)->getFieldDefinitions(array(
+      $this->fieldDefinitions = Drupal::service('plugin.manager.entity')->getStorageController($this->entityType)->getFieldDefinitions(array(
         'EntityType' => $this->entityType,
         'Bundle' => $this->bundle,
       ));
diff --git a/core/lib/Drupal/Core/Entity/Field/Type/EntityTranslation.php b/core/lib/Drupal/Core/Entity/Field/Type/EntityTranslation.php
index 97a5627..cc95e71 100644
--- a/core/lib/Drupal/Core/Entity/Field/Type/EntityTranslation.php
+++ b/core/lib/Drupal/Core/Entity/Field/Type/EntityTranslation.php
@@ -202,7 +202,7 @@ public function access($operation = 'view', \Drupal\user\Plugin\Core\Entity\User
     // @todo Add a way to set and get the langcode so that's more obvious what
     // we're doing here.
     $langcode = substr($this->getName(), 1);
-    return drupal_container()->get('plugin.manager.entity')
+    return Drupal::service('plugin.manager.entity')
       ->getAccessController($this->parent->entityType())
       ->$method($this->parent, $langcode, $account);
   }
diff --git a/core/lib/Drupal/Core/Entity/Field/Type/EntityWrapper.php b/core/lib/Drupal/Core/Entity/Field/Type/EntityWrapper.php
index 691868d..c52c476 100644
--- a/core/lib/Drupal/Core/Entity/Field/Type/EntityWrapper.php
+++ b/core/lib/Drupal/Core/Entity/Field/Type/EntityWrapper.php
@@ -170,7 +170,7 @@ public function getPropertyDefinition($name) {
    */
   public function getPropertyDefinitions() {
     // @todo: Support getting definitions if multiple bundles are specified.
-    return drupal_container()->get('plugin.manager.entity')->getStorageController($this->entityType)->getFieldDefinitions($this->definition['constraints']);
+    return Drupal::service('plugin.manager.entity')->getStorageController($this->entityType)->getFieldDefinitions($this->definition['constraints']);
   }
 
   /**
diff --git a/core/modules/aggregator/aggregator.admin.inc b/core/modules/aggregator/aggregator.admin.inc
index 632f1ec..67b9ff7 100644
--- a/core/modules/aggregator/aggregator.admin.inc
+++ b/core/modules/aggregator/aggregator.admin.inc
@@ -314,7 +314,7 @@ function aggregator_admin_refresh_feed(Feed $feed) {
   // @todo CSRF tokens are validated in page callbacks rather than access
   //   callbacks, because access callbacks are also invoked during menu link
   //   generation. Add token support to routing: http://drupal.org/node/755584.
-  $token = drupal_container()->get('request')->query->get('token');
+  $token = Drupal::service('request')->query->get('token');
   if (!isset($token) || !drupal_valid_token($token, 'aggregator/update/' . $feed->id())) {
     throw new AccessDeniedHttpException();
   }
@@ -345,7 +345,7 @@ function aggregator_admin_form($form, $form_state) {
   aggregator_sanitize_configuration();
 
   // Get all available fetchers.
-  $fetcher_manager = drupal_container()->get('plugin.manager.aggregator.fetcher');
+  $fetcher_manager = Drupal::service('plugin.manager.aggregator.fetcher');
   $fetchers = array();
   foreach ($fetcher_manager->getDefinitions() as $id => $definition) {
     $label = $definition['title'] . ' <span class="description">' . $definition['description'] . '</span>';
@@ -513,7 +513,7 @@ function aggregator_form_category_submit($form, &$form_state) {
   // @todo Replicate this cache invalidation when these ops are separated.
   // Invalidate the block cache to update aggregator category-based derivatives.
   if (module_exists('block')) {
-    drupal_container()->get('plugin.manager.block')->clearCachedDefinitions();
+    Drupal::service('plugin.manager.block')->clearCachedDefinitions();
   }
   if ($form_state['values']['op'] == t('Delete')) {
     $title = $form_state['values']['title'];
diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index 6e89fde..04914c7 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -449,7 +449,7 @@ function aggregator_refresh(Feed $feed) {
   list($fetcher, $parser, $processors) = _aggregator_get_variables();
 
   // Fetch the feed.
-  $fetcher_manager = drupal_container()->get('plugin.manager.aggregator.fetcher');
+  $fetcher_manager = Drupal::service('plugin.manager.aggregator.fetcher');
   try {
     $success = $fetcher_manager->createInstance($fetcher)->fetch($feed);
   }
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/FeedStorageController.php b/core/modules/aggregator/lib/Drupal/aggregator/FeedStorageController.php
index d8c052c..bdf4b90 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/FeedStorageController.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/FeedStorageController.php
@@ -48,7 +48,7 @@ protected function preDelete($entities) {
 
     // Invalidate the block cache to update aggregator feed-based derivatives.
     if (module_exists('block')) {
-      drupal_container()->get('plugin.manager.block')->clearCachedDefinitions();
+      Drupal::service('plugin.manager.block')->clearCachedDefinitions();
     }
     foreach ($entities as $entity) {
       $iids = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $entity->id()))->fetchCol();
@@ -84,7 +84,7 @@ protected function preSave(EntityInterface $entity) {
 
     // Invalidate the block cache to update aggregator feed-based derivatives.
     if (module_exists('block')) {
-      drupal_container()->get('plugin.manager.block')->clearCachedDefinitions();
+      Drupal::service('plugin.manager.block')->clearCachedDefinitions();
     }
     // An existing feed is being modified, delete the category listings.
     db_delete('aggregator_category_feed')
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php
index f1ae82c..09fa88a 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php
@@ -30,7 +30,7 @@ class DefaultFetcher implements FetcherInterface {
    * Implements Drupal\aggregator\Plugin\FetcherInterface::fetch().
    */
   function fetch(Feed $feed) {
-    $request = drupal_container()->get('http_default_client')->get($feed->url->value);
+    $request = Drupal::service('http_default_client')->get($feed->url->value);
     $feed->source_string = FALSE;
 
     // Generate conditional GET headers.
diff --git a/core/modules/block/block.admin.inc b/core/modules/block/block.admin.inc
index 18b9c76..e65a91b 100644
--- a/core/modules/block/block.admin.inc
+++ b/core/modules/block/block.admin.inc
@@ -29,7 +29,7 @@ function block_admin_demo($theme = NULL) {
  * @see block_menu()
  */
 function block_admin_display($theme) {
-  return drupal_container()->get('plugin.manager.entity')
+  return Drupal::service('plugin.manager.entity')
     ->getListController('block')
     ->render($theme);
 }
diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index 18b9d27..8862ebc 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -156,7 +156,7 @@ function block_menu() {
   //   hook_menu_local_tasks() to check for the untranslated tab_parent path.
   // @see http://drupal.org/node/1067408
   $themes = list_themes();
-  foreach (drupal_container()->get('plugin.manager.system.plugin_ui')->getDefinitions() as $plugin_id => $plugin) {
+  foreach (Drupal::service('plugin.manager.system.plugin_ui')->getDefinitions() as $plugin_id => $plugin) {
     list($plugin_base, $key) = explode(':', $plugin_id);
     if ($plugin_base == 'block_plugin_ui') {
       $theme = $themes[$key];
diff --git a/core/modules/block/custom_block/custom_block.admin.inc b/core/modules/block/custom_block/custom_block.admin.inc
index 3451e5d..e2e9f94 100644
--- a/core/modules/block/custom_block/custom_block.admin.inc
+++ b/core/modules/block/custom_block/custom_block.admin.inc
@@ -16,7 +16,7 @@
  * @see custom_block_menu()
  */
 function custom_block_type_list() {
-  return drupal_container()->get('plugin.manager.entity')->getListController('custom_block_type')->render();
+  return Drupal::service('plugin.manager.entity')->getListController('custom_block_type')->render();
 }
 
 /**
diff --git a/core/modules/block/custom_block/custom_block.pages.inc b/core/modules/block/custom_block/custom_block.pages.inc
index 439030e..ba6b790 100644
--- a/core/modules/block/custom_block/custom_block.pages.inc
+++ b/core/modules/block/custom_block/custom_block.pages.inc
@@ -21,7 +21,7 @@
  */
 function custom_block_add_page() {
   $options = array();
-  $request = drupal_container()->get('request');
+  $request = Drupal::service('request');
   if (($theme = $request->attributes->get('theme')) && in_array($theme, array_keys(list_themes()))) {
     // We have navigated to this page from the block library and will keep track
     // of the theme for redirecting the user to the configuration page for the
@@ -85,7 +85,7 @@ function custom_block_add(CustomBlockType $block_type) {
     'type' => $block_type->id()
   ));
   $options = array();
-  $request = drupal_container()->get('request');
+  $request = Drupal::service('request');
   if (($theme = $request->attributes->get('theme')) && in_array($theme, array_keys(list_themes()))) {
     // We have navigated to this page from the block library and will keep track
     // of the theme for redirecting the user to the configuration page for the
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockStorageController.php b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockStorageController.php
index 87ff2d5..f6d087d 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockStorageController.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockStorageController.php
@@ -69,7 +69,7 @@ protected function attachLoad(&$blocks, $load_revision = FALSE) {
    */
   protected function postSave(EntityInterface $block, $update) {
     // Invalidate the block cache to update custom block-based derivatives.
-    drupal_container()->get('plugin.manager.block')->clearCachedDefinitions();
+    Drupal::service('plugin.manager.block')->clearCachedDefinitions();
   }
 
   /**
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/block/block/CustomBlockBlock.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/block/block/CustomBlockBlock.php
index 9219264..ac1dc38 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/block/block/CustomBlockBlock.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/block/block/CustomBlockBlock.php
@@ -68,7 +68,7 @@ public function blockForm($form, &$form_state) {
   public function blockSubmit($form, &$form_state) {
     // Invalidate the block cache to update custom block-based derivatives.
     if (module_exists('block')) {
-      drupal_container()->get('plugin.manager.block')->clearCachedDefinitions();
+      Drupal::service('plugin.manager.block')->clearCachedDefinitions();
     }
   }
 
diff --git a/core/modules/block/lib/Drupal/block/BlockBase.php b/core/modules/block/lib/Drupal/block/BlockBase.php
index 9c90a5a..6f754f6 100644
--- a/core/modules/block/lib/Drupal/block/BlockBase.php
+++ b/core/modules/block/lib/Drupal/block/BlockBase.php
@@ -173,7 +173,7 @@ public function access() {
       if ($visibility['path']['visibility'] < BLOCK_VISIBILITY_PHP) {
         // Compare the lowercase path alias (if any) and internal path.
         $path = current_path();
-        $path_alias = drupal_strtolower(drupal_container()->get('path.alias_manager')->getPathAlias($path));
+        $path_alias = drupal_strtolower(Drupal::service('path.alias_manager')->getPathAlias($path));
         $page_match = drupal_match_path($path_alias, $pages) || (($path != $path_alias) && drupal_match_path($path, $pages));
         // When $block->visibility has a value of 0
         // (BLOCK_VISIBILITY_NOTLISTED), the block is displayed on all pages
diff --git a/core/modules/block/lib/Drupal/block/Plugin/Core/Entity/Block.php b/core/modules/block/lib/Drupal/block/Plugin/Core/Entity/Block.php
index 75d82e8..7374196 100644
--- a/core/modules/block/lib/Drupal/block/Plugin/Core/Entity/Block.php
+++ b/core/modules/block/lib/Drupal/block/Plugin/Core/Entity/Block.php
@@ -123,7 +123,7 @@ public function getPlugin() {
 
       // Create a plugin instance and store its configuration as settings.
       try {
-        $this->instance = drupal_container()->get('plugin.manager.block')->createInstance($this->plugin, $this->settings, $this);
+        $this->instance = Drupal::service('plugin.manager.block')->createInstance($this->plugin, $this->settings, $this);
         $this->settings += $this->instance->getConfig();
       }
       catch (PluginException $e) {
diff --git a/core/modules/block/lib/Drupal/block/Plugin/system/plugin_ui/BlockPluginUI.php b/core/modules/block/lib/Drupal/block/Plugin/system/plugin_ui/BlockPluginUI.php
index 62185e9..50893a2 100644
--- a/core/modules/block/lib/Drupal/block/Plugin/system/plugin_ui/BlockPluginUI.php
+++ b/core/modules/block/lib/Drupal/block/Plugin/system/plugin_ui/BlockPluginUI.php
@@ -47,7 +47,7 @@ public function form($form, &$form_state, $facet = NULL) {
     list($plugin, $theme) = explode(':', $this->getPluginId());
     $plugin_definition = $this->getDefinition();
     // @todo Find out how to let the manager be injected into the class.
-    $manager = drupal_container()->get($plugin_definition['manager']);
+    $manager = Drupal::getContainer()->get($plugin_definition['manager']);
     $plugins = $manager->getDefinitions();
     $form['#theme'] = 'system_plugin_ui_form';
     $form['theme'] = array(
diff --git a/core/modules/breakpoint/breakpoint.install b/core/modules/breakpoint/breakpoint.install
index cba7b1b..e1f8bc7 100644
--- a/core/modules/breakpoint/breakpoint.install
+++ b/core/modules/breakpoint/breakpoint.install
@@ -18,5 +18,5 @@ function breakpoint_enable() {
   _breakpoint_theme_enabled(array_keys($themes));
 
   // Import breakpoints from modules.
-  _breakpoint_modules_enabled(array_keys(drupal_container()->get('module_handler')->getModuleList()));
+  _breakpoint_modules_enabled(array_keys(Drupal::service('module_handler')->getModuleList()));
 }
diff --git a/core/modules/breakpoint/breakpoint.module b/core/modules/breakpoint/breakpoint.module
index b467011..f22c1c8 100644
--- a/core/modules/breakpoint/breakpoint.module
+++ b/core/modules/breakpoint/breakpoint.module
@@ -202,7 +202,7 @@ function _breakpoint_delete_breakpoints($list, $source_type) {
       $breakpoint_group->delete();
 
       // Get all breakpoints defined by this theme/module.
-      $breakpoint_ids = drupal_container()->get('config.storage')->listAll('breakpoint.breakpoint.' . $source_type . '.' . $breakpoint_group->id() . '.');
+      $breakpoint_ids = Drupal::service('config.storage')->listAll('breakpoint.breakpoint.' . $source_type . '.' . $breakpoint_group->id() . '.');
       $entity_info = entity_get_info('breakpoint');
 
       // Remove the breakpoint.breakpoint part of the breakpoint identifier.
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/editor/editor/CKEditor.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/editor/editor/CKEditor.php
index 57b857d..88ac071 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/editor/editor/CKEditor.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/editor/editor/CKEditor.php
@@ -48,7 +48,7 @@ public function getDefaultSettings() {
    */
   public function settingsForm(array $form, array &$form_state, Editor $editor) {
     $module_path = drupal_get_path('module', 'ckeditor');
-    $manager = drupal_container()->get('plugin.manager.ckeditor.plugin');
+    $manager = Drupal::service('plugin.manager.ckeditor.plugin');
 
     $form['toolbar'] = array(
       '#type' => 'container',
@@ -109,7 +109,7 @@ public function getJSSettings(Editor $editor) {
     $language_interface = language(LANGUAGE_TYPE_INTERFACE);
 
     $settings = array();
-    $manager = drupal_container()->get('plugin.manager.ckeditor.plugin');
+    $manager = Drupal::service('plugin.manager.ckeditor.plugin');
 
     // Get the settings for all enabled plugins, even the internal ones.
     $enabled_plugins = array_keys($manager->getEnabledPlugins($editor, TRUE));
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php
index bb17201..6250c5e 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorAdminTest.php
@@ -47,7 +47,7 @@ function setUp() {
   }
 
   function testAdmin() {
-    $manager = drupal_container()->get('plugin.manager.editor');
+    $manager = Drupal::service('plugin.manager.editor');
     $ckeditor = $manager->createInstance('ckeditor');
 
     $this->drupalLogin($this->admin_user);
@@ -143,7 +143,7 @@ function testAdmin() {
     // Now enable the ckeditor_test module, which provides one configurable
     // CKEditor plugin — this should not affect the Editor config entity.
     module_enable(array('ckeditor_test'));
-    drupal_container()->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
+    Drupal::service('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
     $this->drupalGet('admin/config/content/formats/filtered_html');
     $ultra_llama_mode_checkbox = $this->xpath('//input[@type="checkbox" and @name="editor[settings][plugins][llama_contextual_and_button][ultra_llama_mode]" and not(@checked)]');
     $this->assertTrue(count($ultra_llama_mode_checkbox) === 1, 'The "Ultra llama mode" checkbox exists and is not checked.');
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorLoadingTest.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorLoadingTest.php
index 63a816f..269b678 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorLoadingTest.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorLoadingTest.php
@@ -97,7 +97,7 @@ function testLoading() {
     $this->drupalLogin($this->normal_user);
     $this->drupalGet('node/add/article');
     list($settings, $editor_settings_present, $editor_js_present, $body, $format_selector) = $this->getThingsToCheck();
-    $ckeditor_plugin = drupal_container()->get('plugin.manager.editor')->createInstance('ckeditor');
+    $ckeditor_plugin = Drupal::service('plugin.manager.editor')->createInstance('ckeditor');
     $editor = entity_load('editor', 'filtered_html');
     $expected = array('formats' => array('filtered_html' => array(
       'editor' => 'ckeditor',
@@ -119,7 +119,7 @@ function testLoading() {
     // configuration also results in modified CKEditor configuration, so we
     // don't test that here.
     module_enable(array('ckeditor_test'));
-    drupal_container()->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
+    Drupal::service('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
     $editor->settings['toolbar']['buttons'][0][] = 'Llama';
     $editor->settings['plugins']['internal']['link_shortcut'] = 'CTRL+K';
     $editor->save();
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorTest.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorTest.php
index db4dbec..c988aa0 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorTest.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Tests/CKEditorTest.php
@@ -88,7 +88,7 @@ function testGetJSSettings() {
     // Customize the configuration: add button, have two contextually enabled
     // buttons, and configure a CKEditor plugin setting.
     $this->enableModules(array('ckeditor_test'));
-    drupal_container()->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
+    Drupal::service('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
     $editor->settings['toolbar']['buttons'][0][] = 'Strike';
     $editor->settings['toolbar']['buttons'][1][] = 'Format';
     $editor->settings['plugins']['internal']['link_shortcut'] = 'CTRL+K';
@@ -131,7 +131,7 @@ function testBuildToolbarJSSetting() {
 
     // Enable the editor_test module, customize further.
     $this->enableModules(array('ckeditor_test'));
-    drupal_container()->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
+    Drupal::service('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
     $editor->settings['toolbar']['buttons'][0][] = 'Llama';
     $editor->save();
     $expected[count($expected)-2]['items'][] = 'Llama';
@@ -161,7 +161,7 @@ function testBuildContentsCssJSSetting() {
    */
   function testInternalGetConfig() {
     $editor = entity_load('editor', 'filtered_html');
-    $manager = drupal_container()->get('plugin.manager.ckeditor.plugin');
+    $manager = Drupal::service('plugin.manager.ckeditor.plugin');
     $internal_plugin = $manager->createInstance('internal');
 
     // Default toolbar.
@@ -179,7 +179,7 @@ function testInternalGetConfig() {
    */
   function testStylesComboGetConfig() {
     $editor = entity_load('editor', 'filtered_html');
-    $manager = drupal_container()->get('plugin.manager.ckeditor.plugin');
+    $manager = Drupal::service('plugin.manager.ckeditor.plugin');
     $stylescombo_plugin = $manager->createInstance('stylescombo');
 
     // Styles dropdown/button enabled: new setting should be present.
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 9ee6f81..977c316 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -444,12 +444,12 @@ function comment_permalink($cid) {
     $page = comment_get_display_page($comment->id(), $node->type);
 
     // @todo: Cleaner sub request handling.
-    $request = drupal_container()->get('request');
+    $request = Drupal::service('request');
     $subrequest = Request::create('/node/' . $node->nid, 'GET', $request->query->all(), $request->cookies->all(), array(), $request->server->all());
     $subrequest->query->set('page', $page);
     // @todo: Convert the pager to use the request object.
     $_GET['page'] = $page;
-    return drupal_container()->get('http_kernel')->handle($subrequest, HttpKernelInterface::SUB_REQUEST);
+    return Drupal::service('http_kernel')->handle($subrequest, HttpKernelInterface::SUB_REQUEST);
   }
   throw new NotFoundHttpException();
 }
diff --git a/core/modules/comment/comment.pages.inc b/core/modules/comment/comment.pages.inc
index da359a4..dfad97d 100644
--- a/core/modules/comment/comment.pages.inc
+++ b/core/modules/comment/comment.pages.inc
@@ -111,7 +111,7 @@ function comment_approve($cid) {
   // @todo CSRF tokens are validated in page callbacks rather than access
   //   callbacks, because access callbacks are also invoked during menu link
   //   generation. Add token support to routing: http://drupal.org/node/755584.
-  $token = drupal_container()->get('request')->query->get('token');
+  $token = Drupal::service('request')->query->get('token');
   if (!isset($token) || !drupal_valid_token($token, "comment/$cid/approve")) {
     throw new AccessDeniedHttpException();
   }
diff --git a/core/modules/comment/comment.views.inc b/core/modules/comment/comment.views.inc
index e74c97c..02dffa1 100644
--- a/core/modules/comment/comment.views.inc
+++ b/core/modules/comment/comment.views.inc
@@ -360,7 +360,7 @@ function comment_views_data() {
     ),
   );
 
-  if (drupal_container()->get('module_handler')->moduleExists('translation_entity')) {
+  if (Drupal::service('module_handler')->moduleExists('translation_entity')) {
     $data['comment']['translation_link'] = array(
       'title' => t('Translation link'),
       'help' => t('Provide a link to the translations overview for comments.'),
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php
index e30b7ca..6a0f1a6 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php
@@ -40,7 +40,7 @@ public function query() {
         )
       )
     );
-    $join = drupal_container()->get('plugin.manager.views.join')->createInstance('standard', $definition);
+    $join = Drupal::service('plugin.manager.views.join')->createInstance('standard', $definition);
 
     // ncs_user alias so this can work with the sort handler, below.
 //    $this->user_table = $this->query->add_relationship(NULL, $join, 'users', $this->relationship);
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php
index c7021b9..6094648 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php
@@ -31,7 +31,7 @@ public function query() {
       'left_table' => $this->tableAlias,
       'left_field' => 'last_comment_uid',
     );
-    $join = drupal_container()->get('plugin.manager.views.join')->createInstance('standard', $definition);
+    $join = Drupal::service('plugin.manager.views.join')->createInstance('standard', $definition);
 
     // @todo this might be safer if we had an ensure_relationship rather than guessing
     // the table alias. Though if we did that we'd be guessing the relationship name
diff --git a/core/modules/config/config.admin.inc b/core/modules/config/config.admin.inc
index 3813885..98feaf6 100644
--- a/core/modules/config/config.admin.inc
+++ b/core/modules/config/config.admin.inc
@@ -78,8 +78,8 @@ function config_admin_sync_form(array &$form, array &$form_state, StorageInterfa
  */
 function config_admin_import_form($form, &$form_state) {
   // Retrieve a list of differences between last known state and active store.
-  $source_storage = drupal_container()->get('config.storage.staging');
-  $target_storage = drupal_container()->get('config.storage');
+  $source_storage = Drupal::service('config.storage.staging');
+  $target_storage = Drupal::service('config.storage');
 
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] = array(
@@ -103,7 +103,7 @@ function config_admin_import_form_submit($form, &$form_state) {
     // Once a sync completes, we empty the staging directory. This prevents
     // changes from being accidentally overwritten by stray files getting
     // imported later.
-    $source_storage = drupal_container()->get('config.storage.staging');
+    $source_storage = Drupal::service('config.storage.staging');
     foreach ($source_storage->listAll() as $name) {
       $source_storage->delete($name);
     }
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigLocaleOverride.php b/core/modules/config/lib/Drupal/config/Tests/ConfigLocaleOverride.php
index cee642e..6453b52 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigLocaleOverride.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigLocaleOverride.php
@@ -110,7 +110,7 @@ function testConfigLocaleUserOverride() {
       'preferred_langcode' => 'de',
     ));
 
-    $config_factory = drupal_container()->get('config.factory');
+    $config_factory = Drupal::service('config.factory');
     $config_factory->enterContext($user_config_context->setAccount($account));
     // Should not have to re-initialize the configuration object to get new
     // overrides as the new context will have a different uuid.
diff --git a/core/modules/config/tests/config_test/config_test.module b/core/modules/config/tests/config_test/config_test.module
index d0d59fd..48f443b 100644
--- a/core/modules/config/tests/config_test/config_test.module
+++ b/core/modules/config/tests/config_test/config_test.module
@@ -83,7 +83,7 @@ function config_test_load($id) {
  * Page callback; Lists available ConfigTest objects.
  */
 function config_test_list_page() {
-  return drupal_container()->get('plugin.manager.entity')
+  return Drupal::service('plugin.manager.entity')
     ->getListController('config_test')
     ->render();
 }
diff --git a/core/modules/contact/contact.admin.inc b/core/modules/contact/contact.admin.inc
index bc706c3..6bc8ed3 100644
--- a/core/modules/contact/contact.admin.inc
+++ b/core/modules/contact/contact.admin.inc
@@ -17,7 +17,7 @@
  */
 function contact_category_list() {
   drupal_set_title(t('Contact form categories'));
-  return drupal_container()->get('plugin.manager.entity')
+  return Drupal::service('plugin.manager.entity')
     ->getListController('contact_category')
     ->render();
 }
diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module
index 4957052..62d7ef9 100644
--- a/core/modules/contact/contact.module
+++ b/core/modules/contact/contact.module
@@ -159,7 +159,7 @@ function _contact_personal_tab_access($account) {
 
   // If the requested user has disabled their contact form, do not allow users
   // to contact them.
-  $account_data = drupal_container()->get('user.data')->get('contact', $account->id(), 'enabled');
+  $account_data = Drupal::service('user.data')->get('contact', $account->id(), 'enabled');
   if (isset($account_data) && empty($account_data)) {
     return FALSE;
   }
@@ -342,7 +342,7 @@ function contact_form_user_profile_form_alter(&$form, &$form_state) {
     '#weight' => 5,
   );
   $account = $form_state['controller']->getEntity($form_state);
-  $account_data = drupal_container()->get('user.data')->get('contact', $account->id(), 'enabled');
+  $account_data = Drupal::service('user.data')->get('contact', $account->id(), 'enabled');
   $form['contact']['contact'] = array(
     '#type' => 'checkbox',
     '#title' => t('Personal contact form'),
@@ -356,7 +356,7 @@ function contact_form_user_profile_form_alter(&$form, &$form_state) {
  */
 function contact_user_update($account) {
   if (isset($account->contact)) {
-    drupal_container()->get('user.data')->set('contact', $account->id(), 'enabled', (int) $account->contact);
+    Drupal::service('user.data')->set('contact', $account->id(), 'enabled', (int) $account->contact);
   }
 }
 
diff --git a/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php b/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php
index 07b5308..1d301f3 100644
--- a/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php
+++ b/core/modules/contact/lib/Drupal/contact/Tests/Views/ContactFieldsTest.php
@@ -60,7 +60,7 @@ protected function setUp() {
   public function testViewsData() {
     $field_name = $this->field['field_name'];
     $table_name = _field_sql_storage_tablename($this->field);
-    $data = drupal_container()->get('views.views_data')->get($table_name);
+    $data = Drupal::service('views.views_data')->get($table_name);
 
     // Test that the expected data array is returned.
     $expected = array('', '_value', '_format');
diff --git a/core/modules/edit/edit.module b/core/modules/edit/edit.module
index e4a3f82..f29c6c5 100644
--- a/core/modules/edit/edit.module
+++ b/core/modules/edit/edit.module
@@ -54,7 +54,7 @@ function edit_contextual_links_view_alter(&$element, $items) {
   }
 
   // Include the attachments and settings for all available editors.
-  $attachments = drupal_container()->get('edit.editor.selector')->getAllEditorAttachments();
+  $attachments = Drupal::service('edit.editor.selector')->getAllEditorAttachments();
   $element['#attached'] = NestedArray::mergeDeep($element['#attached'], $attachments);
 }
 
diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module
index 6db6210..edee080 100644
--- a/core/modules/editor/editor.module
+++ b/core/modules/editor/editor.module
@@ -93,7 +93,7 @@ function editor_form_filter_admin_overview_alter(&$form, $form_state) {
   $form['formats']['#header'] = array_merge($start, $form['formats']['#header']);
 
   // Then splice in the name of each text editor for each text format.
-  $editors = drupal_container()->get('plugin.manager.editor')->getDefinitions();
+  $editors = Drupal::service('plugin.manager.editor')->getDefinitions();
   foreach (element_children($form['formats']) as $format_id) {
     $editor = editor_load($format_id);
     $editor_name = ($editor && isset($editors[$editor->editor])) ? $editors[$editor->editor]['label'] : drupal_placeholder('—');
@@ -111,7 +111,7 @@ function editor_form_filter_admin_format_form_alter(&$form, &$form_state) {
   if (!isset($form_state['editor'])) {
     $format_id = $form['#format']->format;
     $form_state['editor'] = editor_load($format_id);
-    $form_state['editor_manager'] = drupal_container()->get('plugin.manager.editor');
+    $form_state['editor_manager'] = Drupal::service('plugin.manager.editor');
   }
   $editor = $form_state['editor'];
   $manager = $form_state['editor_manager'];
@@ -284,7 +284,7 @@ function editor_pre_render_format($element) {
   $element['#attached']['library'][] = array('editor', 'drupal.editor');
 
   // Attach attachments for all available editors.
-  $manager = drupal_container()->get('plugin.manager.editor');
+  $manager = Drupal::service('plugin.manager.editor');
   $element['#attached'] = NestedArray::mergeDeep($element['#attached'], $manager->getAttachments($format_ids));
 
   return $element;
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/Core/Entity/Editor.php b/core/modules/editor/lib/Drupal/editor/Plugin/Core/Entity/Editor.php
index 22271ee..e683fb4 100644
--- a/core/modules/editor/lib/Drupal/editor/Plugin/Core/Entity/Editor.php
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/Core/Entity/Editor.php
@@ -71,7 +71,7 @@ public function label($langcode = NULL) {
   public function __construct(array $values, $entity_type) {
     parent::__construct($values, $entity_type);
 
-    $manager = drupal_container()->get('plugin.manager.editor');
+    $manager = Drupal::service('plugin.manager.editor');
     $plugin = $manager->createInstance($this->editor);
 
     // Initialize settings, merging module-provided defaults.
diff --git a/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityDisplay.php b/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityDisplay.php
index d88967f..500b80a 100644
--- a/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityDisplay.php
+++ b/core/modules/entity/lib/Drupal/entity/Plugin/Core/Entity/EntityDisplay.php
@@ -239,7 +239,7 @@ public function setComponent($name, array $options = array()) {
 
     if ($instance = field_info_instance($this->targetEntityType, $name, $this->bundle)) {
       $field = field_info_field($instance['field_name']);
-      $options = drupal_container()->get('plugin.manager.field.formatter')->prepareConfiguration($field['type'], $options);
+      $options = Drupal::service('plugin.manager.field.formatter')->prepareConfiguration($field['type'], $options);
 
       // Clear the persisted formatter, if any.
       unset($this->formatters[$name]);
@@ -325,7 +325,7 @@ public function getFormatter($field_name) {
     // Instantiate the formatter object from the stored display properties.
     if ($configuration = $this->getComponent($field_name)) {
       $instance = field_info_instance($this->targetEntityType, $field_name, $this->bundle);
-      $formatter = drupal_container()->get('plugin.manager.field.formatter')->getInstance(array(
+      $formatter = Drupal::service('plugin.manager.field.formatter')->getInstance(array(
         'instance' => $instance,
         'view_mode' => $this->originalViewMode,
         // No need to prepare, defaults have been merged in setComponent().
diff --git a/core/modules/entity_reference/entity_reference.module b/core/modules/entity_reference/entity_reference.module
index f5e968c..aecc7b2 100644
--- a/core/modules/entity_reference/entity_reference.module
+++ b/core/modules/entity_reference/entity_reference.module
@@ -92,7 +92,7 @@ function entity_reference_get_selection_handler($field, $instance, EntityInterfa
     'instance' => $instance,
     'entity' => $entity,
   );
-  return drupal_container()->get('plugin.manager.entity_reference.selection')->getInstance($options);
+  return Drupal::service('plugin.manager.entity_reference.selection')->getInstance($options);
 }
 
 /**
@@ -241,10 +241,10 @@ function entity_reference_field_instance_settings_form($field, $instance, $form_
   $settings += array('handler' => 'default');
 
   // Get all selection plugins for this entity type.
-  $selection_plugins = drupal_container()->get('plugin.manager.entity_reference.selection')->getSelectionGroups($field['settings']['target_type']);
+  $selection_plugins = Drupal::service('plugin.manager.entity_reference.selection')->getSelectionGroups($field['settings']['target_type']);
   $handler_groups = array_keys($selection_plugins);
 
-  $handlers = drupal_container()->get('plugin.manager.entity_reference.selection')->getDefinitions();
+  $handlers = Drupal::service('plugin.manager.entity_reference.selection')->getDefinitions();
   $handlers_options = array();
   foreach ($handlers as $plugin_id => $plugin) {
     // We only display base plugins (e.g. 'base', 'views', ..) and not entity
@@ -531,7 +531,7 @@ function entity_reference_autocomplete_callback($type, $field_name, $entity_type
   $prefix = '';
 
   // Get the typed string, if exists from the URL.
-  $tags_typed = drupal_container()->get('request')->query->get('q');
+  $tags_typed = Drupal::service('request')->query->get('q');
   $tags_typed = drupal_explode_tags($tags_typed);
   $string = drupal_strtolower(array_pop($tags_typed));
 
diff --git a/core/modules/field/field.crud.inc b/core/modules/field/field.crud.inc
index f6ee8a2..a2b88b5 100644
--- a/core/modules/field/field.crud.inc
+++ b/core/modules/field/field.crud.inc
@@ -854,7 +854,7 @@ function field_purge_batch($batch_size) {
   // Retrieve all deleted field instances. We cannot use field_info_instances()
   // because that function does not return deleted instances.
   $instances = field_read_instances(array('deleted' => 1), array('include_deleted' => 1));
-  $factory = drupal_container()->get('entity.query');
+  $factory = Drupal::service('entity.query');
   $info = entity_get_info();
   foreach ($instances as $instance) {
     $entity_type = $instance['entity_type'];
diff --git a/core/modules/field/field.info.inc b/core/modules/field/field.info.inc
index b422b47..1816c6e 100644
--- a/core/modules/field/field.info.inc
+++ b/core/modules/field/field.info.inc
@@ -222,10 +222,10 @@ function field_info_field_types($field_type = NULL) {
  */
 function field_info_widget_types($widget_type = NULL) {
   if ($widget_type) {
-    return drupal_container()->get('plugin.manager.field.widget')->getDefinition($widget_type);
+    return Drupal::service('plugin.manager.field.widget')->getDefinition($widget_type);
   }
   else {
-    return drupal_container()->get('plugin.manager.field.widget')->getDefinitions();
+    return Drupal::service('plugin.manager.field.widget')->getDefinitions();
   }
 }
 
@@ -243,10 +243,10 @@ function field_info_widget_types($widget_type = NULL) {
  */
 function field_info_formatter_types($formatter_type = NULL) {
   if ($formatter_type) {
-    return drupal_container()->get('plugin.manager.field.formatter')->getDefinition($formatter_type);
+    return Drupal::service('plugin.manager.field.formatter')->getDefinition($formatter_type);
   }
   else {
-    return drupal_container()->get('plugin.manager.field.formatter')->getDefinitions();
+    return Drupal::service('plugin.manager.field.formatter')->getDefinitions();
   }
 }
 
diff --git a/core/modules/field/field.module b/core/modules/field/field.module
index 6cdd628..4b0c10b 100644
--- a/core/modules/field/field.module
+++ b/core/modules/field/field.module
@@ -541,7 +541,7 @@ function field_modules_disabled($modules) {
 function field_sync_field_status() {
   // Refresh the 'active' and 'storage_active' columns according to the current
   // set of enabled modules.
-  $modules = array_keys(drupal_container()->get('module_handler')->getModuleList());
+  $modules = array_keys(Drupal::service('module_handler')->getModuleList());
   foreach ($modules as $module_name) {
     field_associate_fields($module_name);
   }
@@ -932,7 +932,7 @@ function field_view_field(EntityInterface $entity, $field_name, $display_options
     // hook_field_attach_display_alter() needs to receive the 'prepared'
     // $display_options, so we cannot let preparation happen internally.
     $field = field_info_field($field_name);
-    $formatter_manager = drupal_container()->get('plugin.manager.field.formatter');
+    $formatter_manager = Drupal::service('plugin.manager.field.formatter');
     $display_options = $formatter_manager->prepareConfiguration($field['type'], $display_options);
     $formatter = $formatter_manager->getInstance(array(
       'instance' => $instance,
@@ -1013,7 +1013,7 @@ function field_get_items(EntityInterface $entity, $field_name, $langcode = NULL)
 function field_has_data($field) {
   $field = field_info_field_by_id($field['id']);
   $columns = array_keys($field['columns']);
-  $factory = drupal_container()->get('entity.query');
+  $factory = Drupal::service('entity.query');
   foreach ($field['bundles'] as $entity_type => $bundle) {
     // Entity Query throws an exception if there is no base table.
     $entity_info = entity_get_info($entity_type);
diff --git a/core/modules/field/lib/Drupal/field/FieldInstance.php b/core/modules/field/lib/Drupal/field/FieldInstance.php
index ba6ea44..b9b3542 100644
--- a/core/modules/field/lib/Drupal/field/FieldInstance.php
+++ b/core/modules/field/lib/Drupal/field/FieldInstance.php
@@ -61,7 +61,7 @@ public function getWidget() {
         'settings' => $widget_properties['settings'],
         'weight' => $widget_properties['weight'],
       );
-      $this->widget = drupal_container()->get('plugin.manager.field.widget')->getInstance($options);
+      $this->widget = Drupal::service('plugin.manager.field.widget')->getInstance($options);
     }
 
     return $this->widget;
diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
index 976aa05..ad35f7a 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/views/field/Field.php
@@ -129,7 +129,7 @@ function get_base_table() {
         $relationships = $this->view->display_handler->getOption('relationships');
         if (!empty($relationships[$this->options['relationship']])) {
           $options = $relationships[$this->options['relationship']];
-          $data = drupal_container()->get('views.views_data')->get($options['table']);
+          $data = Drupal::service('views.views_data')->get($options['table']);
           $this->base_table = $data[$options['field']]['relationship']['base'];
         }
       }
@@ -191,7 +191,7 @@ public function query($use_groupby = FALSE) {
         // @see this::field_langcode()
         $default_langcode = language_default()->langcode;
         $langcode = str_replace(array('***CURRENT_LANGUAGE***', '***DEFAULT_LANGUAGE***'),
-                                array(drupal_container()->get(LANGUAGE_TYPE_CONTENT)->langcode, $default_langcode),
+                                array(Drupal::getContainer()->get(LANGUAGE_TYPE_CONTENT)->langcode, $default_langcode),
                                 $this->view->display_handler->options['field_langcode']);
         $placeholder = $this->placeholder();
         $langcode_fallback_candidates = array($langcode);
@@ -403,7 +403,7 @@ public function buildOptionsForm(&$form, &$form_state) {
 
     // Get the settings form.
     $settings_form = array('#value' => array());
-    if ($formatter = drupal_container()->get('plugin.manager.field.formatter')->getInstance($options)) {
+    if ($formatter = Drupal::service('plugin.manager.field.formatter')->getInstance($options)) {
       $settings_form = $formatter->settingsForm($form, $form_state);
     }
     $form['settings'] = $settings_form;
@@ -845,7 +845,7 @@ function field_langcode(EntityInterface $entity) {
     if (field_is_translatable($entity->entityType(), $this->field_info)) {
       $default_langcode = language_default()->langcode;
       $langcode = str_replace(array('***CURRENT_LANGUAGE***', '***DEFAULT_LANGUAGE***'),
-                              array(drupal_container()->get(LANGUAGE_TYPE_CONTENT)->langcode, $default_langcode),
+                              array(Drupal::getContainer()->get(LANGUAGE_TYPE_CONTENT)->langcode, $default_langcode),
                               $this->view->display_handler->options['field_language']);
 
       // Give the Field Language API a chance to fallback to a different language
diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php b/core/modules/field/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php
index 087a2e5..67ae2bf 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php
@@ -40,7 +40,7 @@ public function query() {
     $this->ensureMyTable();
     // First, relate our base table to the current base table to the
     // field, using the base table's id field to the field's column.
-    $views_data = drupal_container()->get('views.views_data')->get($this->table);
+    $views_data = Drupal::service('views.views_data')->get($this->table);
     $left_field = $views_data['table']['base']['field'];
 
     $first = array(
@@ -64,7 +64,7 @@ public function query() {
     else {
       $id = 'standard';
     }
-    $first_join = drupal_container()->get('plugin.manager.views.join')->createInstance($id, $first);
+    $first_join = Drupal::service('plugin.manager.views.join')->createInstance($id, $first);
 
 
     $this->first_alias = $this->query->add_table($this->definition['field table'], $this->relationship, $first_join);
@@ -89,7 +89,7 @@ public function query() {
     else {
       $id = 'standard';
     }
-    $second_join = drupal_container()->get('plugin.manager.views.join')->createInstance($id, $second);
+    $second_join = Drupal::service('plugin.manager.views.join')->createInstance($id, $second);
     $second_join->adjusted = TRUE;
 
     // use a short alias for this:
diff --git a/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php b/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php
index c365961..e5d5a1b 100644
--- a/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php
@@ -158,7 +158,7 @@ function testDeleteFieldInstance() {
     $bundle = reset($this->bundles);
     $field = reset($this->fields);
     $field_name = $field['field_name'];
-    $factory = drupal_container()->get('entity.query');
+    $factory = Drupal::service('entity.query');
 
     // There are 10 entities of this bundle.
     $found = $factory->get('test_entity')
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
index 7ee40f4..d0bdc0d 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
@@ -171,7 +171,7 @@ public function buildForm(array $form, array &$form_state) {
 
       // Get the corresponding formatter object.
       if ($display_options && $display_options['type'] != 'hidden') {
-        $formatter = drupal_container()->get('plugin.manager.field.formatter')->getInstance(array(
+        $formatter = Drupal::service('plugin.manager.field.formatter')->getInstance(array(
           'instance' => $instance,
           'view_mode' => $this->view_mode,
           'configuration' => $display_options
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index 69fcbf3..592d3c4 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -144,7 +144,7 @@ function file_load($fid, $reset = FALSE) {
  * @return Drupal\file\FileUsage\FileUsageInterface.
  */
 function file_usage() {
-  return drupal_container()->get('file.usage');
+  return Drupal::service('file.usage');
 }
 
 /**
@@ -413,7 +413,7 @@ function file_validate_size(File $file, $file_limit = 0, $user_limit = 0) {
   }
 
   // Save a query by only calling spaceUsed() when a limit is provided.
-  if ($user_limit && (drupal_container()->get('plugin.manager.entity')->getStorageController('file')->spaceUsed($user->uid) + $file->filesize) > $user_limit) {
+  if ($user_limit && (Drupal::service('plugin.manager.entity')->getStorageController('file')->spaceUsed($user->uid) + $file->filesize) > $user_limit) {
     $errors[] = t('The file is %filesize which would exceed your disk quota of %quota.', array('%filesize' => format_size($file->filesize), '%quota' => format_size($user_limit)));
   }
 
@@ -715,7 +715,7 @@ function file_file_download($uri, $field_type = 'file') {
  * Implements file_cron()
  */
 function file_cron() {
-  $result = drupal_container()->get('plugin.manager.entity')->getStorageController('file')->retrieveTemporaryFiles();
+  $result = Drupal::service('plugin.manager.entity')->getStorageController('file')->retrieveTemporaryFiles();
   foreach ($result as $row) {
     if ($file = file_load($row->fid)) {
       $references = file_usage()->listUsage($file);
diff --git a/core/modules/language/tests/language_test/language_test.module b/core/modules/language/tests/language_test/language_test.module
index cb97937..1d307f7 100644
--- a/core/modules/language/tests/language_test/language_test.module
+++ b/core/modules/language/tests/language_test/language_test.module
@@ -117,5 +117,5 @@ function language_test_menu() {
  * Page callback. Uses a subrequest to retrieve the 'user' page.
  */
 function language_test_subrequest() {
-  return drupal_container()->get('http_kernel')->handle(Request::create('/user'), HttpKernelInterface::SUB_REQUEST);
+  return Drupal::service('http_kernel')->handle(Request::create('/user'), HttpKernelInterface::SUB_REQUEST);
 }
diff --git a/core/modules/layout/layout.module b/core/modules/layout/layout.module
index c6ed7ae..1d47c5f 100644
--- a/core/modules/layout/layout.module
+++ b/core/modules/layout/layout.module
@@ -61,7 +61,7 @@ function layout_permission() {
  *   The layout plugin manager instance.
  */
 function layout_manager() {
-  return drupal_container()->get('plugin.manager.layout');
+  return Drupal::service('plugin.manager.layout');
 }
 
 /**
diff --git a/core/modules/layout/lib/Drupal/layout/Plugin/Derivative/Layout.php b/core/modules/layout/lib/Drupal/layout/Plugin/Derivative/Layout.php
index c5d0dde..c429258 100644
--- a/core/modules/layout/lib/Drupal/layout/Plugin/Derivative/Layout.php
+++ b/core/modules/layout/lib/Drupal/layout/Plugin/Derivative/Layout.php
@@ -59,7 +59,7 @@ public function getDerivativeDefinitions(array $base_plugin_definition) {
 
     // Add all modules as possible layout providers.
     // @todo Inject the module handler.
-    foreach (drupal_container()->get('module_handler')->getModuleList() as $module => $filename) {
+    foreach (Drupal::service('module_handler')->getModuleList() as $module => $filename) {
       $available_layout_providers[$module] = array(
         'type' => 'module',
         'provider' => $module,
diff --git a/core/modules/layout/lib/Drupal/layout/Tests/LayoutDerivativesTest.php b/core/modules/layout/lib/Drupal/layout/Tests/LayoutDerivativesTest.php
index f41460c..16199b8 100644
--- a/core/modules/layout/lib/Drupal/layout/Tests/LayoutDerivativesTest.php
+++ b/core/modules/layout/lib/Drupal/layout/Tests/LayoutDerivativesTest.php
@@ -33,7 +33,7 @@ public static function getInfo() {
    * Tests for module/theme layout derivatives.
    */
   function testDerivatives() {
-    $manager = drupal_container()->get('plugin.manager.layout');
+    $manager = Drupal::service('plugin.manager.layout');
 
     $definitions = $manager->getDefinitions();
     $this->assertTrue(is_array($definitions), 'Definitions found.');
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocalePathTest.php b/core/modules/locale/lib/Drupal/locale/Tests/LocalePathTest.php
index 4f49d02..15d6021 100644
--- a/core/modules/locale/lib/Drupal/locale/Tests/LocalePathTest.php
+++ b/core/modules/locale/lib/Drupal/locale/Tests/LocalePathTest.php
@@ -109,13 +109,13 @@ function testPathLanguageConfiguration() {
       'alias'    => $custom_path,
       'langcode' => LANGUAGE_NOT_SPECIFIED,
     );
-    drupal_container()->get('path.crud')->save($edit['source'], $edit['alias'], $edit['langcode']);
-    $lookup_path = drupal_container()->get('path.alias_manager')->getPathAlias('node/' . $node->nid, 'en');
+    Drupal::service('path.crud')->save($edit['source'], $edit['alias'], $edit['langcode']);
+    $lookup_path = Drupal::service('path.alias_manager')->getPathAlias('node/' . $node->nid, 'en');
     $this->assertEqual($english_path, $lookup_path, t('English language alias has priority.'));
     // Same check for language 'xx'.
-    $lookup_path = drupal_container()->get('path.alias_manager')->getPathAlias('node/' . $node->nid, $prefix);
+    $lookup_path = Drupal::service('path.alias_manager')->getPathAlias('node/' . $node->nid, $prefix);
     $this->assertEqual($custom_language_path, $lookup_path, t('Custom language alias has priority.'));
-    drupal_container()->get('path.crud')->delete($edit);
+    Drupal::service('path.crud')->delete($edit);
 
     // Create language nodes to check priority of aliases.
     $first_node = $this->drupalCreateNode(array('type' => 'page', 'promote' => 1));
@@ -127,7 +127,7 @@ function testPathLanguageConfiguration() {
       'alias'    => $custom_path,
       'langcode' => 'en',
     );
-    drupal_container()->get('path.crud')->save($edit['source'], $edit['alias'], $edit['langcode']);
+    Drupal::service('path.crud')->save($edit['source'], $edit['alias'], $edit['langcode']);
 
     // Assign a custom path alias to second node with LANGUAGE_NOT_SPECIFIED.
     $edit = array(
@@ -135,7 +135,7 @@ function testPathLanguageConfiguration() {
       'alias'    => $custom_path,
       'langcode' => LANGUAGE_NOT_SPECIFIED,
     );
-    drupal_container()->get('path.crud')->save($edit['source'], $edit['alias'], $edit['langcode']);
+    Drupal::service('path.crud')->save($edit['source'], $edit['alias'], $edit['langcode']);
 
     // Test that both node titles link to our path alias.
     $this->drupalGet('<front>');
diff --git a/core/modules/menu/menu.admin.inc b/core/modules/menu/menu.admin.inc
index 9ac32e2..1b051b1 100644
--- a/core/modules/menu/menu.admin.inc
+++ b/core/modules/menu/menu.admin.inc
@@ -14,7 +14,7 @@
  * Menu callback which shows an overview page of all the custom menus and their descriptions.
  */
 function menu_overview_page() {
-  return drupal_container()->get('plugin.manager.entity')
+  return Drupal::service('plugin.manager.entity')
     ->getListController('menu')
     ->render();
 }
@@ -327,7 +327,7 @@ function menu_delete_menu_page(Menu $menu) {
 function menu_delete_menu_confirm($form, &$form_state, Menu $menu) {
   $form['#menu'] = $menu;
   $caption = '';
-  $num_links = drupal_container()->get('plugin.manager.entity')
+  $num_links = Drupal::service('plugin.manager.entity')
     ->getStorageController('menu_link')->countMenuLinks($menu->id());
   if ($num_links) {
     $caption .= '<p>' . format_plural($num_links, '<strong>Warning:</strong> There is currently 1 menu link in %title. It will be deleted (system-defined items will be reset).', '<strong>Warning:</strong> There are currently @count menu links in %title. They will be deleted (system-defined links will be reset).', array('%title' => $menu->label())) . '</p>';
diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index 46d6ead..6e3c98c 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -194,7 +194,7 @@ function menu_theme() {
  * Add a link for each custom menu.
  */
 function menu_enable() {
-  drupal_container()->get('router.builder')->rebuild();
+  Drupal::service('router.builder')->rebuild();
   menu_router_rebuild();
   $system_link = entity_load_multiple_by_properties('menu_link', array('link_path' => 'admin/structure/menu', 'module' => 'system'));
   $system_link = reset($system_link);
@@ -243,7 +243,7 @@ function menu_menu_insert(Menu $menu) {
   menu_cache_clear_all();
   // Invalidate the block cache to update menu-based derivatives.
   if (module_exists('block')) {
-    drupal_container()->get('plugin.manager.block')->clearCachedDefinitions();
+    Drupal::service('plugin.manager.block')->clearCachedDefinitions();
   }
   // Make sure the menu is present in the active menus variable so that its
   // items may appear in the menu active trail.
@@ -266,7 +266,7 @@ function menu_menu_update(Menu $menu) {
   menu_cache_clear_all();
   // Invalidate the block cache to update menu-based derivatives.
   if (module_exists('block')) {
-    drupal_container()->get('plugin.manager.block')->clearCachedDefinitions();
+    Drupal::service('plugin.manager.block')->clearCachedDefinitions();
   }
 }
 
@@ -295,7 +295,7 @@ function menu_menu_delete(Menu $menu) {
 
   // Invalidate the block cache to update menu-based derivatives.
   if (module_exists('block')) {
-    drupal_container()->get('plugin.manager.block')->clearCachedDefinitions();
+    Drupal::service('plugin.manager.block')->clearCachedDefinitions();
   }
 }
 
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
index 9506602..a978fea 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
@@ -110,7 +110,7 @@ public function form(array $form, array &$form_state, EntityInterface $menu_link
     );
 
     // Get number of items in menu so the weight selector is sized appropriately.
-    $delta = drupal_container()->get('plugin.manager.entity')
+    $delta = Drupal::service('plugin.manager.entity')
       ->getStorageController('menu_link')->countMenuLinks($menu_link->menu_name);
     $form['weight'] = array(
       '#type' => 'weight',
@@ -148,7 +148,7 @@ protected function actions(array $form, array &$form_state) {
   public function validate(array $form, array &$form_state) {
     $menu_link = $this->buildEntity($form, $form_state);
 
-    $normal_path = drupal_container()->get('path.alias_manager.cached')->getSystemPath($menu_link->link_path);
+    $normal_path = Drupal::service('path.alias_manager.cached')->getSystemPath($menu_link->link_path);
     if ($menu_link->link_path != $normal_path) {
       drupal_set_message(t('The menu system stores system paths only, but will use the URL alias for display. %link_path has been stored as %normal_path', array('%link_path' => $menu_link->link_path, '%normal_path' => $normal_path)));
       $menu_link->link_path = $normal_path;
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php
index 5180b3e..1d684d4 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php
@@ -79,7 +79,7 @@ protected function attachLoad(&$menu_links, $load_revision = FALSE) {
 
     // Now mass-load any routes needed and associate them.
     if ($routes) {
-      $route_objects = drupal_container()->get('router.route_provider')->getRoutesByNames($routes);
+      $route_objects = Drupal::service('router.route_provider')->getRoutesByNames($routes);
       foreach ($routes as $entity_id => $route) {
         $menu_links[$entity_id]->setRouteObject($route_objects[$route]);
       }
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php b/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
index ce3911d..1b11428 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
@@ -275,7 +275,7 @@ public function getRoute() {
       return NULL;
     }
     if (!($this->routeObject instanceof Route)) {
-      $route_provider = drupal_container()->get('router.route_provider');
+      $route_provider = Drupal::service('router.route_provider');
       $this->routeObject = $route_provider->getRouteByName($this->route_name);
     }
     return $this->routeObject;
@@ -343,7 +343,7 @@ public static function buildFromRouterItem(array $item) {
       'link_path' => $item['path'],
       'options' => empty($item['description']) ? array() : array('attributes' => array('title' => $item['description'])),
     );
-    return drupal_container()->get('plugin.manager.entity')
+    return Drupal::service('plugin.manager.entity')
       ->getStorageController('menu_link')->create($item);
   }
 
diff --git a/core/modules/menu_link/menu_link.module b/core/modules/menu_link/menu_link.module
index ed11c78..f0a8518 100644
--- a/core/modules/menu_link/menu_link.module
+++ b/core/modules/menu_link/menu_link.module
@@ -86,7 +86,7 @@ function menu_link_delete_multiple(array $mlids, $force = FALSE, $prevent_repare
     return;
   }
 
-  $controller = drupal_container()->get('plugin.manager.entity')
+  $controller = Drupal::service('plugin.manager.entity')
     ->getStorageController('menu_link');
   if (!$force) {
     $entity_query = entity_query('menu_link');
@@ -137,7 +137,7 @@ function menu_link_save(MenuLink $menu_link) {
  *   The insert op returns the mlid of the new item. Others op return NULL.
  */
 function menu_link_maintain($module, $op, $link_path, $link_title = NULL) {
-  $menu_link_controller = drupal_container()->get('plugin.manager.entity')
+  $menu_link_controller = Drupal::service('plugin.manager.entity')
     ->getStorageController('menu_link');
   switch ($op) {
     case 'insert':
diff --git a/core/modules/node/node.views.inc b/core/modules/node/node.views.inc
index 5d14a38..8576b84 100644
--- a/core/modules/node/node.views.inc
+++ b/core/modules/node/node.views.inc
@@ -209,7 +209,7 @@ function node_views_data() {
     );
   }
 
-  if (drupal_container()->get('module_handler')->moduleExists('translation_entity')) {
+  if (Drupal::service('module_handler')->moduleExists('translation_entity')) {
     $data['node']['translation_link'] = array(
       'title' => t('Translation link'),
       'help' => t('Provide a link to the translations overview for nodes.'),
diff --git a/core/modules/options/options.module b/core/modules/options/options.module
index 793b07e..05cbed1 100644
--- a/core/modules/options/options.module
+++ b/core/modules/options/options.module
@@ -389,7 +389,7 @@ function options_field_update_forbid($field, $prior_field, $has_data) {
 function _options_values_in_use($field, $values) {
   if ($values) {
     $field = field_info_field_by_id($field['id']);
-    $factory = drupal_container()->get('entity.query');
+    $factory = Drupal::service('entity.query');
     foreach ($field['bundles'] as $entity_type => $bundle) {
       $result = $factory->get($entity_type)
         ->condition($field['field_name'] . '.value', $values)
diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module
index cc29255..33b8bc8 100644
--- a/core/modules/overlay/overlay.module
+++ b/core/modules/overlay/overlay.module
@@ -99,7 +99,7 @@ function overlay_field_extra_fields() {
 function overlay_form_user_profile_form_alter(&$form, &$form_state) {
   $account = $form_state['controller']->getEntity($form_state);
   if (user_access('access overlay', $account)) {
-    $account_data = drupal_container()->get('user.data')->get('overlay', $account->id(), 'enabled');
+    $account_data = Drupal::service('user.data')->get('overlay', $account->id(), 'enabled');
     $form['overlay_control'] = array(
       '#type' => 'details',
       '#title' => t('Administrative overlay'),
@@ -119,7 +119,7 @@ function overlay_form_user_profile_form_alter(&$form, &$form_state) {
  */
 function overlay_user_update($account) {
   if (isset($account->overlay)) {
-    drupal_container()->get('user.data')->set('overlay', $account->id(), 'enabled', (int) $account->overlay);
+    Drupal::service('user.data')->set('overlay', $account->id(), 'enabled', (int) $account->overlay);
   }
 }
 
@@ -138,7 +138,7 @@ function overlay_init() {
 
   // Only act if the user has access to the overlay and a mode was not already
   // set. Other modules can also enable the overlay directly for other uses.
-  $user_data = drupal_container()->get('user.data')->get('overlay', $user->uid, 'enabled');
+  $user_data = Drupal::service('user.data')->get('overlay', $user->uid, 'enabled');
   $use_overlay = !isset($user_data) || $user_data;
   if (empty($mode) && user_access('access overlay') && $use_overlay) {
     $current_path = current_path();
@@ -360,12 +360,12 @@ function overlay_user_dismiss_message() {
   // @todo CSRF tokens are validated in page callbacks rather than access
   //   callbacks, because access callbacks are also invoked during menu link
   //   generation. Add token support to routing: http://drupal.org/node/755584.
-  $token = drupal_container()->get('request')->query->get('token');
+  $token = Drupal::service('request')->query->get('token');
   if (!isset($token) || !drupal_valid_token($token, 'overlay')) {
     throw new AccessDeniedHttpException();
   }
 
-  drupal_container()->get('user.data')->set('overlay', $user->uid, 'message_dismissed', 1);
+  Drupal::service('user.data')->set('overlay', $user->uid, 'message_dismissed', 1);
   drupal_set_message(t('The message has been dismissed. You can change your overlay settings at any time by visiting your profile page.'));
   // Destination is normally given. Go to the user profile as a fallback.
   drupal_goto('user/' . $user->uid . '/edit');
@@ -392,7 +392,7 @@ function overlay_disable_message() {
     return $build;
   }
 
-  $user_data = drupal_container()->get('user.data')->get('overlay', $user->uid);
+  $user_data = Drupal::service('user.data')->get('overlay', $user->uid);
   if (empty($user_data['message_dismissed']) && (!isset($user_data['enabled']) || $user_data['enabled'])) {
     $build = array(
       '#theme' => 'overlay_disable_message',
@@ -732,7 +732,7 @@ function overlay_overlay_child_initialize() {
   // it to the same content rendered in overlay_exit(), at the end of the page
   // request. This allows us to check if anything actually did change, and, if
   // so, trigger an immediate Ajax refresh of the parent window.
-  $token = drupal_container()->get('request')->query->get('token');
+  $token = Drupal::service('request')->query->get('token');
   if (!empty($_POST) || isset($token)) {
     foreach (overlay_supplemental_regions() as $region) {
       overlay_store_rendered_content($region, overlay_render_region($region));
diff --git a/core/modules/path/lib/Drupal/path/Tests/PathAliasTest.php b/core/modules/path/lib/Drupal/path/Tests/PathAliasTest.php
index 23ff7f7..339a847 100644
--- a/core/modules/path/lib/Drupal/path/Tests/PathAliasTest.php
+++ b/core/modules/path/lib/Drupal/path/Tests/PathAliasTest.php
@@ -92,7 +92,7 @@ function testAdminAlias() {
     $this->assertText($node1->label(), 'Changed alias works.');
     $this->assertResponse(200);
 
-    drupal_container()->get('path.alias_manager')->cacheClear();
+    Drupal::service('path.alias_manager')->cacheClear();
     // Confirm that previous alias no longer works.
     $this->drupalGet($previous);
     $this->assertNoText($node1->label(), 'Previous alias no longer works.');
diff --git a/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php b/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php
index 455a3f6..0f8ce63 100644
--- a/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php
+++ b/core/modules/path/lib/Drupal/path/Tests/PathLanguageTest.php
@@ -82,7 +82,7 @@ function testAliasTranslation() {
     $this->drupalPost(NULL, $edit, t('Save'));
 
     // Clear the path lookup cache.
-    drupal_container()->get('path.alias_manager')->cacheClear();
+    Drupal::service('path.alias_manager')->cacheClear();
 
     // Ensure the node was created.
     $french_node = $this->drupalGetNodeByTitle($edit["title"]);
@@ -147,18 +147,18 @@ function testAliasTranslation() {
 
     // The alias manager has an internal path lookup cache. Check to see that
     // it has the appropriate contents at this point.
-    drupal_container()->get('path.alias_manager')->cacheClear();
-    $french_node_path = drupal_container()->get('path.alias_manager')->getSystemPath($french_alias, $french_node->langcode);
+    Drupal::service('path.alias_manager')->cacheClear();
+    $french_node_path = Drupal::service('path.alias_manager')->getSystemPath($french_alias, $french_node->langcode);
     $this->assertEqual($french_node_path, 'node/' . $french_node->nid, 'Normal path works.');
     // Second call should return the same path.
-    $french_node_path = drupal_container()->get('path.alias_manager')->getSystemPath($french_alias, $french_node->langcode);
+    $french_node_path = Drupal::service('path.alias_manager')->getSystemPath($french_alias, $french_node->langcode);
     $this->assertEqual($french_node_path, 'node/' . $french_node->nid, 'Normal path is the same.');
 
     // Confirm that the alias works.
-    $french_node_alias = drupal_container()->get('path.alias_manager')->getPathAlias('node/' . $french_node->nid, $french_node->langcode);
+    $french_node_alias = Drupal::service('path.alias_manager')->getPathAlias('node/' . $french_node->nid, $french_node->langcode);
     $this->assertEqual($french_node_alias, $french_alias, 'Alias works.');
     // Second call should return the same alias.
-    $french_node_alias = drupal_container()->get('path.alias_manager')->getPathAlias('node/' . $french_node->nid, $french_node->langcode);
+    $french_node_alias = Drupal::service('path.alias_manager')->getPathAlias('node/' . $french_node->nid, $french_node->langcode);
     $this->assertEqual($french_node_alias, $french_alias, 'Alias is the same.');
   }
 }
diff --git a/core/modules/path/path.admin.inc b/core/modules/path/path.admin.inc
index 0535454..a0ca08a 100644
--- a/core/modules/path/path.admin.inc
+++ b/core/modules/path/path.admin.inc
@@ -75,7 +75,7 @@ function path_admin_overview($keys = NULL) {
 
     // If the system path maps to a different URL alias, highlight this table
     // row to let the user know of old aliases.
-    if ($data->alias != drupal_container()->get('path.alias_manager')->getPathAlias($data->source, $data->langcode)) {
+    if ($data->alias != Drupal::service('path.alias_manager')->getPathAlias($data->source, $data->langcode)) {
       $row['class'] = array('warning');
     }
 
@@ -217,7 +217,7 @@ function path_admin_form_delete_submit($form, &$form_state) {
  */
 function path_admin_form_validate($form, &$form_state) {
   $source = &$form_state['values']['source'];
-  $source = drupal_container()->get('path.alias_manager')->getSystemPath($source);
+  $source = Drupal::service('path.alias_manager')->getSystemPath($source);
   $alias = $form_state['values']['alias'];
   $pid = isset($form_state['values']['pid']) ? $form_state['values']['pid'] : 0;
   // Language is only set if language.module is enabled, otherwise save for all
@@ -251,13 +251,13 @@ function path_admin_form_submit($form, &$form_state) {
 
   $pid = isset($form_state['values']['pid']) ? $form_state['values']['pid'] : 0;
   $source = &$form_state['values']['source'];
-  $source = drupal_container()->get('path.alias_manager')->getSystemPath($source);
+  $source = Drupal::service('path.alias_manager')->getSystemPath($source);
   $alias = $form_state['values']['alias'];
   // Language is only set if language.module is enabled, otherwise save for all
   // languages.
   $langcode = isset($form_state['values']['langcode']) ? $form_state['values']['langcode'] : LANGUAGE_NOT_SPECIFIED;
 
-  drupal_container()->get('path.crud')->save($source, $alias, $langcode, $pid);
+  Drupal::service('path.crud')->save($source, $alias, $langcode, $pid);
 
   drupal_set_message(t('The alias has been saved.'));
   $form_state['redirect'] = 'admin/config/search/path';
@@ -289,7 +289,7 @@ function path_admin_delete_confirm($form, &$form_state, $path) {
  */
 function path_admin_delete_confirm_submit($form, &$form_state) {
   if ($form_state['values']['confirm']) {
-    drupal_container()->get('path.crud')->delete(array('pid' => $form_state['path']['pid']));
+    Drupal::service('path.crud')->delete(array('pid' => $form_state['path']['pid']));
     $form_state['redirect'] = 'admin/config/search/path';
   }
 }
diff --git a/core/modules/path/path.module b/core/modules/path/path.module
index 6401a8b..d4c117d 100644
--- a/core/modules/path/path.module
+++ b/core/modules/path/path.module
@@ -106,7 +106,7 @@ function path_form_node_form_alter(&$form, $form_state) {
     if ($node->langcode != LANGUAGE_NOT_SPECIFIED) {
       $conditions['langcode'] = $node->langcode;
     }
-    $path = drupal_container()->get('path.crud')->load($conditions);
+    $path = Drupal::service('path.crud')->load($conditions);
     if ($path === FALSE) {
       $path = array();
     }
@@ -194,7 +194,7 @@ function path_node_insert(Node $node) {
       // Ensure fields for programmatic executions.
       $source = 'node/' . $node->nid;
       $langcode = isset($node->langcode) ? $node->langcode : LANGUAGE_NOT_SPECIFIED;
-      drupal_container()->get('path.crud')->save($source, $alias, $langcode);
+      Drupal::service('path.crud')->save($source, $alias, $langcode);
     }
   }
 }
@@ -208,14 +208,14 @@ function path_node_update(Node $node) {
     $alias = trim($path['alias']);
     // Delete old alias if user erased it.
     if (!empty($path['pid']) && empty($path['alias'])) {
-      drupal_container()->get('path.crud')->delete(array('pid' => $path['pid']));
+      Drupal::service('path.crud')->delete(array('pid' => $path['pid']));
     }
     // Only save a non-empty alias.
     if (!empty($path['alias'])) {
       // Ensure fields for programmatic executions.
       $source = 'node/' . $node->nid;
       $langcode = isset($node->langcode) ? $node->langcode : LANGUAGE_NOT_SPECIFIED;
-      drupal_container()->get('path.crud')->save($source, $alias, $langcode, $path['pid']);
+      Drupal::service('path.crud')->save($source, $alias, $langcode, $path['pid']);
     }
   }
 }
@@ -225,7 +225,7 @@ function path_node_update(Node $node) {
  */
 function path_node_predelete(Node $node) {
   // Delete all aliases associated with this node.
-  drupal_container()->get('path.crud')->delete(array('source' => 'node/' . $node->nid));
+  Drupal::service('path.crud')->delete(array('source' => 'node/' . $node->nid));
 }
 
 /**
@@ -235,7 +235,7 @@ function path_form_taxonomy_term_form_alter(&$form, $form_state) {
   // Make sure this does not show up on the delete confirmation form.
   if (empty($form_state['confirm_delete'])) {
     $term = $form_state['controller']->getEntity($form_state);
-    $path = (isset($term->tid) ? drupal_container()->get('path.crud')->load(array('source' => 'taxonomy/term/' . $term->tid)) : array());
+    $path = (isset($term->tid) ? Drupal::service('path.crud')->load(array('source' => 'taxonomy/term/' . $term->tid)) : array());
     if ($path === FALSE) {
       $path = array();
     }
@@ -276,7 +276,7 @@ function path_taxonomy_term_insert(Term $term) {
       // Ensure fields for programmatic executions.
       $path['source'] = 'taxonomy/term/' . $term->tid;
       $path['langcode'] = LANGUAGE_NOT_SPECIFIED;
-      drupal_container()->get('path.crud')->save($path['source'], $path['alias'], $path['langcode']);
+      Drupal::service('path.crud')->save($path['source'], $path['alias'], $path['langcode']);
     }
   }
 }
@@ -290,7 +290,7 @@ function path_taxonomy_term_update(Term $term) {
     $path['alias'] = trim($path['alias']);
     // Delete old alias if user erased it.
     if (!empty($path['pid']) && empty($path['alias'])) {
-      drupal_container()->get('path.crud')->delete(array('pid' => $path['pid']));
+      Drupal::service('path.crud')->delete(array('pid' => $path['pid']));
     }
     // Only save a non-empty alias.
     if (!empty($path['alias'])) {
@@ -298,7 +298,7 @@ function path_taxonomy_term_update(Term $term) {
       // Ensure fields for programmatic executions.
       $path['source'] = 'taxonomy/term/' . $term->tid;
       $path['langcode'] = LANGUAGE_NOT_SPECIFIED;
-      drupal_container()->get('path.crud')->save($path['source'], $path['alias'], $path['langcode'], $pid);
+      Drupal::service('path.crud')->save($path['source'], $path['alias'], $path['langcode'], $pid);
     }
   }
 }
@@ -308,7 +308,7 @@ function path_taxonomy_term_update(Term $term) {
  */
 function path_taxonomy_term_delete(Term $term) {
   // Delete all aliases associated with this term.
-  drupal_container()->get('path.crud')->delete(array('source' => 'taxonomy/term/' . $term->tid));
+  Drupal::service('path.crud')->delete(array('source' => 'taxonomy/term/' . $term->tid));
 }
 
 /**
diff --git a/core/modules/picture/picture_mapping.admin.inc b/core/modules/picture/picture_mapping.admin.inc
index a3d6ade..4cf7be7 100644
--- a/core/modules/picture/picture_mapping.admin.inc
+++ b/core/modules/picture/picture_mapping.admin.inc
@@ -16,7 +16,7 @@
  * @see picture_menu()
  */
 function picture_mapping_page() {
-  return drupal_container()->get('plugin.manager.entity')
+  return Drupal::service('plugin.manager.entity')
     ->getListController('picture_mapping')
     ->render();
 }
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/ResourceBase.php b/core/modules/rest/lib/Drupal/rest/Plugin/ResourceBase.php
index 747df45..0d12270 100644
--- a/core/modules/rest/lib/Drupal/rest/Plugin/ResourceBase.php
+++ b/core/modules/rest/lib/Drupal/rest/Plugin/ResourceBase.php
@@ -68,7 +68,7 @@ public function routes() {
         case 'HEAD':
           // Restrict GET and HEAD requests to the media type specified in the
           // HTTP Accept headers.
-          $formats = drupal_container()->getParameter('serializer.formats');
+          $formats = Drupal::getContainer()->getParameter('serializer.formats');
           foreach ($formats as $format_name => $label) {
             // Expose one route per available format.
             //$format_route = new Route($route->getPattern(), $route->getDefaults(), $route->getRequirements());
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php b/core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php
index 3496ee0..db47a15 100644
--- a/core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php
+++ b/core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php
@@ -74,7 +74,7 @@ class RestExport extends PathPluginBase {
   public function initDisplay(ViewExecutable $view, array &$display, array &$options = NULL) {
     parent::initDisplay($view, $display, $options);
 
-    $container = drupal_container();
+    $container = Drupal::getContainer();
     $negotiation = $container->get('content_negotiation');
     $request = $container->get('request');
 
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/views/style/Serializer.php b/core/modules/rest/lib/Drupal/rest/Plugin/views/style/Serializer.php
index 1906cfa..9b14b57 100644
--- a/core/modules/rest/lib/Drupal/rest/Plugin/views/style/Serializer.php
+++ b/core/modules/rest/lib/Drupal/rest/Plugin/views/style/Serializer.php
@@ -52,7 +52,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
     parent::init($view, $display, $options);
 
     // Get the serializer service.
-    $this->serializer = drupal_container()->get('serializer');
+    $this->serializer = Drupal::service('serializer');
   }
 
   /**
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php b/core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php
index a3a5c60..ca2847d 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/CreateTest.php
@@ -33,7 +33,7 @@ public static function getInfo() {
    * Tests several valid and invalid create requests on all entity types.
    */
   public function testCreate() {
-    $serializer = drupal_container()->get('serializer');
+    $serializer = Drupal::service('serializer');
     // @todo once EntityNG is implemented for other entity types test all other
     // entity types here as well.
     $entity_type = 'entity_test';
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php b/core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php
index c428c86..8d669fb 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/RESTTestBase.php
@@ -177,7 +177,7 @@ protected function enableService($resource_type, $method = 'GET', $format = NULL
     $config->save();
 
     // Rebuild routing cache, so that the web API paths are available.
-    drupal_container()->get('router.builder')->rebuild();
+    Drupal::service('router.builder')->rebuild();
     // Reset the Simpletest permission cache, so that the new resource
     // permissions get picked up.
     drupal_static_reset('checkPermissions');
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php b/core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php
index 94be2bf..97ac2a0 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php
@@ -33,7 +33,7 @@ public static function getInfo() {
    * Tests several valid and invalid partial update requests on test entities.
    */
   public function testPatchUpdate() {
-    $serializer = drupal_container()->get('serializer');
+    $serializer = Drupal::service('serializer');
     // @todo once EntityNG is implemented for other entity types test all other
     // entity types here as well.
     $entity_type = 'entity_test';
@@ -98,7 +98,7 @@ public function testPatchUpdate() {
    * Tests several valid and invalid PUT update requests on test entities.
    */
   public function testPutUpdate() {
-    $serializer = drupal_container()->get('serializer');
+    $serializer = Drupal::service('serializer');
     // @todo once EntityNG is implemented for other entity types test all other
     // entity types here as well.
     $entity_type = 'entity_test';
diff --git a/core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php b/core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php
index 4aeaaa7..da5b4de 100644
--- a/core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php
+++ b/core/modules/rest/lib/Drupal/rest/Tests/Views/StyleSerializerTest.php
@@ -113,7 +113,7 @@ public function testSerializerResponses() {
     $this->executeView($view);
 
     // Get the serializer service.
-    $serializer = drupal_container()->get('serializer');
+    $serializer = Drupal::service('serializer');
 
     $entities = array();
     foreach ($view->result as $row) {
diff --git a/core/modules/rest/rest.admin.inc b/core/modules/rest/rest.admin.inc
index 95246ea..6b5a9a3 100644
--- a/core/modules/rest/rest.admin.inc
+++ b/core/modules/rest/rest.admin.inc
@@ -11,7 +11,7 @@
  * @ingroup forms
  */
 function rest_admin_form($form, &$form_state) {
-  $resources = drupal_container()
+  $resources = Drupal::getContainer()
     ->get('plugin.manager.rest')
     ->getDefinitions();
   $entity_resources = array();
@@ -87,7 +87,7 @@ function rest_admin_form_submit($form, &$form_state) {
     $enabled_resources += array_filter($form_state['values']['other_resources']);
   }
   $resources = array();
-  $plugin_manager = drupal_container()->get('plugin.manager.rest');
+  $plugin_manager = Drupal::service('plugin.manager.rest');
 
   // Enable all methods and all formats for each selected resource.
   foreach ($enabled_resources as $resource) {
@@ -102,5 +102,5 @@ function rest_admin_form_submit($form, &$form_state) {
   $config->save();
 
   // Rebuild routing cache.
-  drupal_container()->get('router.builder')->rebuild();
+  Drupal::service('router.builder')->rebuild();
 }
diff --git a/core/modules/rest/rest.module b/core/modules/rest/rest.module
index 233db32..66c9254 100644
--- a/core/modules/rest/rest.module
+++ b/core/modules/rest/rest.module
@@ -28,8 +28,8 @@ function rest_menu() {
  */
 function rest_permission() {
   $permissions = array();
-  if (drupal_container()->has('plugin.manager.rest')) {
-    $manager = drupal_container()->get('plugin.manager.rest');
+  if (Drupal::getContainer()->has('plugin.manager.rest')) {
+    $manager = Drupal::service('plugin.manager.rest');
     $resources = config('rest.settings')->get('resources');
     if ($resources && $enabled = array_intersect_key($manager->getDefinitions(), $resources)) {
       foreach ($enabled as $key => $resource) {
diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php b/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php
index 354b0c1..fb3e69a 100644
--- a/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php
+++ b/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php
@@ -68,7 +68,7 @@ public function query($group_by = FALSE) {
         'left_table' => $search_index,
         'left_field' => 'word',
       );
-      $join = drupal_container()->get('plugin.manager.views.join')->createInstance('standard', $definition);
+      $join = Drupal::service('plugin.manager.views.join')->createInstance('standard', $definition);
       $search_total = $this->query->add_relationship('search_total', $join, $search_index);
 
       $this->search_score = $this->query->add_field('', "SUM($search_index.score * $search_total.count)", 'score', array('aggregate' => TRUE));
diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php b/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php
index 3c961b6..153485e 100644
--- a/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php
+++ b/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php
@@ -148,7 +148,7 @@ public function query() {
         'left_table' => $search_index,
         'left_field' => 'word',
       );
-      $join = drupal_container()->get('plugin.manager.views.join')->createInstance('standard', $definition);
+      $join = Drupal::service('plugin.manager.views.join')->createInstance('standard', $definition);
 
       $search_total = $this->query->add_relationship('search_total', $join, $search_index);
 
diff --git a/core/modules/search/search.module b/core/modules/search/search.module
index 375c43f..7c231db 100644
--- a/core/modules/search/search.module
+++ b/core/modules/search/search.module
@@ -629,7 +629,7 @@ function search_index($sid, $module, $text, $langcode) {
         if ($tagname == 'a') {
           // Check if link points to a node on this site
           if (preg_match($node_regexp, $value, $match)) {
-            $path = drupal_container()->get('path.alias_manager')->getSystemPath($match[1]);
+            $path = Drupal::service('path.alias_manager')->getSystemPath($match[1]);
             if (preg_match('!(?:node|book)/(?:view/)?([0-9]+)!i', $path, $match)) {
               $linknid = $match[1];
               if ($linknid > 0) {
diff --git a/core/modules/serialization/lib/Drupal/serialization/Tests/SerializationTest.php b/core/modules/serialization/lib/Drupal/serialization/Tests/SerializationTest.php
index e0c62cd..be49104 100644
--- a/core/modules/serialization/lib/Drupal/serialization/Tests/SerializationTest.php
+++ b/core/modules/serialization/lib/Drupal/serialization/Tests/SerializationTest.php
@@ -36,7 +36,7 @@ public static function getInfo() {
 
   protected function setUp() {
     parent::setUp();
-    $this->serializer = drupal_container()->get('serializer');
+    $this->serializer = Drupal::service('serializer');
   }
 
   /**
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php b/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php
index ca1d88b..4dddce8 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php
@@ -31,7 +31,7 @@ function testShortcutLinkAdd() {
       'source' => 'node/' . $this->node->nid,
       'alias' => $this->randomName(8),
     );
-    drupal_container()->get('path.crud')->save($path['source'], $path['alias']);
+    Drupal::service('path.crud')->save($path['source'], $path['alias']);
 
     // Create some paths to test.
     $test_cases = array(
@@ -54,7 +54,7 @@ function testShortcutLinkAdd() {
       $saved_set = shortcut_set_load($set->id());
       $paths = $this->getShortcutInformation($saved_set, 'link_path');
       $test_path = empty($test['path']) ? '<front>' : $test['path'];
-      $this->assertTrue(in_array(drupal_container()->get('path.alias_manager')->getSystemPath($test_path), $paths), 'Shortcut created: '. $test['path']);
+      $this->assertTrue(in_array(Drupal::service('path.alias_manager')->getSystemPath($test_path), $paths), 'Shortcut created: '. $test['path']);
       $this->assertLink($title, 0, 'Shortcut link found on the page.');
     }
   }
diff --git a/core/modules/shortcut/shortcut.admin.inc b/core/modules/shortcut/shortcut.admin.inc
index 0e43052..685b78a 100644
--- a/core/modules/shortcut/shortcut.admin.inc
+++ b/core/modules/shortcut/shortcut.admin.inc
@@ -368,7 +368,7 @@ function _shortcut_link_form_elements($shortcut_link = NULL) {
     ));
   }
   else {
-    $shortcut_link['link_path'] = ($shortcut_link['link_path'] == '<front>') ? '' : drupal_container()->get('path.alias_manager')->getPathAlias($shortcut_link['link_path']);
+    $shortcut_link['link_path'] = ($shortcut_link['link_path'] == '<front>') ? '' : Drupal::service('path.alias_manager')->getPathAlias($shortcut_link['link_path']);
   }
 
   $form['shortcut_link']['#tree'] = TRUE;
@@ -415,7 +415,7 @@ function shortcut_link_edit_validate($form, &$form_state) {
  */
 function shortcut_link_edit_submit($form, &$form_state) {
   // Normalize the path in case it is an alias.
-  $shortcut_path = drupal_container()->get('path.alias_manager')->getSystemPath($form_state['values']['shortcut_link']['link_path']);
+  $shortcut_path = Drupal::service('path.alias_manager')->getSystemPath($form_state['values']['shortcut_link']['link_path']);
   if (empty($shortcut_path)) {
     $shortcut_path = '<front>';
   }
@@ -459,7 +459,7 @@ function shortcut_link_add_submit($form, &$form_state) {
  */
 function shortcut_admin_add_link($shortcut_link, &$shortcut_set) {
   // Normalize the path in case it is an alias.
-  $shortcut_link['link_path'] = drupal_container()->get('path.alias_manager')->getSystemPath($shortcut_link['link_path']);
+  $shortcut_link['link_path'] = Drupal::service('path.alias_manager')->getSystemPath($shortcut_link['link_path']);
   if (empty($shortcut_link['link_path'])) {
     $shortcut_link['link_path'] = '<front>';
   }
diff --git a/core/modules/shortcut/shortcut.module b/core/modules/shortcut/shortcut.module
index 25a04c7..82373d4 100644
--- a/core/modules/shortcut/shortcut.module
+++ b/core/modules/shortcut/shortcut.module
@@ -458,7 +458,7 @@ function shortcut_set_title_exists($title) {
  */
 function shortcut_valid_link($path) {
   // Do not use URL aliases.
-  $normal_path = drupal_container()->get('path.alias_manager')->getSystemPath($path);
+  $normal_path = Drupal::service('path.alias_manager')->getSystemPath($path);
   if ($path != $normal_path) {
     $path = $normal_path;
   }
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
index bc472c4..a1a47c5 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/DrupalUnitTestBase.php
@@ -87,7 +87,7 @@ protected function setUp() {
 
     parent::setUp();
     // Build a minimal, partially mocked environment for unit tests.
-    $this->containerBuild(drupal_container());
+    $this->containerBuild(Drupal::getContainer());
     // Make sure it survives kernel rebuilds.
     $GLOBALS['conf']['container_bundles'][] = 'Drupal\simpletest\TestBundle';
 
@@ -156,7 +156,7 @@ public function containerBuild($container) {
     $container->set('keyvalue.memory', $this->keyValueFactory);
     if (!$container->has('keyvalue')) {
       // TestBase::setUp puts a completely empty container in
-      // drupal_container() which is somewhat the mirror of the empty
+      // Drupal::getContainer() which is somewhat the mirror of the empty
       // environment being set up. Unit tests need not to waste time with
       // getting a container set up for them. Drupal Unit Tests might just get
       // away with a simple container holding the absolute bare minimum. When
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
index 35af531..a00a326 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
@@ -852,7 +852,7 @@ protected function prepareEnvironment() {
     $this->originalConf = $conf;
 
     // Backup statics and globals.
-    $this->originalContainer = clone drupal_container();
+    $this->originalContainer = clone Drupal::getContainer();
     $this->originalLanguage = $language_interface;
     $this->originalConfigDirectories = $GLOBALS['config_directories'];
     if (isset($GLOBALS['theme_key'])) {
@@ -947,7 +947,7 @@ protected function prepareConfigDirectories() {
   }
 
   /**
-   * Rebuild drupal_container().
+   * Rebuild Drupal::getContainer().
    *
    * Use this to build a new kernel and service container. For example, when the
    * list of enabled modules is changed via the internal browser, in which case
@@ -955,7 +955,7 @@ protected function prepareConfigDirectories() {
    * old module list.
    *
    * @todo Fix http://drupal.org/node/1708692 so that module enable/disable
-   *   changes are immediately reflected in drupal_container(). Until then,
+   *   changes are immediately reflected in Drupal::getContainer(). Until then,
    *   tests can invoke this workaround when requiring services from newly
    *   enabled modules to be immediately available in the same request.
    *
@@ -965,9 +965,9 @@ protected function prepareConfigDirectories() {
   protected function rebuildContainer() {
     $this->kernel = new DrupalKernel('testing', FALSE, drupal_classloader(), FALSE);
     $this->kernel->boot();
-    // DrupalKernel replaces the container in drupal_container() with a
+    // DrupalKernel replaces the container in Drupal::getContainer() with a
     // different object, so we need to replace the instance on this test class.
-    $this->container = drupal_container();
+    $this->container = Drupal::getContainer();
   }
 
   /**
@@ -1010,7 +1010,7 @@ protected function tearDown() {
     // In case a fatal error occurred that was not in the test process read the
     // log to pick up any fatal errors.
     simpletest_log_read($this->testId, $this->databasePrefix, get_class($this), TRUE);
-    if (($container = drupal_container()) && $container->has('keyvalue')) {
+    if (($container = Drupal::getContainer()) && $container->has('keyvalue')) {
       $captured_emails = state()->get('system.test_email_collector') ?: array();
       $emailCount = count($captured_emails);
       if ($emailCount) {
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/DrupalUnitTestBaseTest.php b/core/modules/simpletest/lib/Drupal/simpletest/Tests/DrupalUnitTestBaseTest.php
index 3aeab60..385cabe 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/Tests/DrupalUnitTestBaseTest.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/Tests/DrupalUnitTestBaseTest.php
@@ -39,7 +39,7 @@ function testSetUp() {
     // Verify that specified $modules have been loaded.
     $this->assertTrue(function_exists('entity_test_permission'), "$module.module was loaded.");
     // Verify that there is a fixed module list.
-    $this->assertIdentical(array_keys(drupal_container()->get('module_handler')->getModuleList()), array($module));
+    $this->assertIdentical(array_keys(Drupal::service('module_handler')->getModuleList()), array($module));
     $this->assertIdentical(module_implements('permission'), array($module));
 
     // Verify that no modules have been installed.
@@ -54,7 +54,7 @@ function testEnableModulesLoad() {
 
     // Verify that the module does not exist yet.
     $this->assertFalse(module_exists($module), "$module module not found.");
-    $list = array_keys(drupal_container()->get('module_handler')->getModuleList());
+    $list = array_keys(Drupal::service('module_handler')->getModuleList());
     $this->assertFalse(in_array($module, $list), "$module module not found in the extension handler's module list.");
     $list = module_implements('permission');
     $this->assertFalse(in_array($module, $list), "{$module}_permission() in module_implements() not found.");
@@ -64,7 +64,7 @@ function testEnableModulesLoad() {
 
     // Verify that the module exists.
     $this->assertTrue(module_exists($module), "$module module found.");
-    $list = array_keys(drupal_container()->get('module_handler')->getModuleList());
+    $list = array_keys(Drupal::service('module_handler')->getModuleList());
     $this->assertTrue(in_array($module, $list), "$module module found in the extension handler's module list.");
     $list = module_implements('permission');
     $this->assertTrue(in_array($module, $list), "{$module}_permission() in module_implements() found.");
@@ -79,7 +79,7 @@ function testEnableModulesInstall() {
 
     // Verify that the module does not exist yet.
     $this->assertFalse(module_exists($module), "$module module not found.");
-    $list = array_keys(drupal_container()->get('module_handler')->getModuleList());
+    $list = array_keys(Drupal::service('module_handler')->getModuleList());
     $this->assertFalse(in_array($module, $list), "$module module not found in the extension handler's module list.");
     $list = module_implements('permission');
     $this->assertFalse(in_array($module, $list), "{$module}_permission() in module_implements() not found.");
@@ -93,7 +93,7 @@ function testEnableModulesInstall() {
 
     // Verify that the enabled module exists.
     $this->assertTrue(module_exists($module), "$module module found.");
-    $list = array_keys(drupal_container()->get('module_handler')->getModuleList());
+    $list = array_keys(Drupal::service('module_handler')->getModuleList());
     $this->assertTrue(in_array($module, $list), "$module module found in the extension handler's module list.");
     $list = module_implements('permission');
     $this->assertTrue(in_array($module, $list), "{$module}_permission() in module_implements() found.");
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
index 44e29c2..b8eb9c2 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
@@ -177,7 +177,7 @@ function __construct($test_id = NULL) {
    */
   function drupalGetNodeByTitle($title, $reset = FALSE) {
     if ($reset) {
-      drupal_container()->get('plugin.manager.entity')->getStorageController('node')->resetCache();
+      Drupal::service('plugin.manager.entity')->getStorageController('node')->resetCache();
     }
     $nodes = entity_load_multiple_by_properties('node', array('title' => $title));
     // Load the first node returned from the database.
@@ -898,7 +898,7 @@ protected function refreshVariables() {
     global $conf;
     cache('bootstrap')->delete('variables');
     $conf = variable_initialize();
-    drupal_container()->get('config.factory')->reset();
+    Drupal::service('config.factory')->reset();
   }
 
   /**
diff --git a/core/modules/statistics/statistics.admin.inc b/core/modules/statistics/statistics.admin.inc
index d454321c..1f6c9db 100644
--- a/core/modules/statistics/statistics.admin.inc
+++ b/core/modules/statistics/statistics.admin.inc
@@ -41,6 +41,6 @@ function statistics_settings_form_submit($form, &$form_state) {
   // The popular statistics block is dependent on these settings, so clear the
   // block plugin definitions cache.
   if (module_exists('block')) {
-    drupal_container()->get('plugin.manager.block')->clearCachedDefinitions();
+    Drupal::service('plugin.manager.block')->clearCachedDefinitions();
   }
 }
diff --git a/core/modules/statistics/statistics.module b/core/modules/statistics/statistics.module
index f6a9d48..367f29f 100644
--- a/core/modules/statistics/statistics.module
+++ b/core/modules/statistics/statistics.module
@@ -173,7 +173,7 @@ function statistics_get($nid) {
  *   A string as a link, truncated to the width, linked to the given $path.
  */
 function _statistics_link($path, $width = 35) {
-  $title = drupal_container()->get('path.alias_manager')->getPathAlias($path);
+  $title = Drupal::service('path.alias_manager')->getPathAlias($path);
   $title = truncate_utf8($title, $width, FALSE, TRUE);
   return l($title, $path);
 }
diff --git a/core/modules/system/language.api.php b/core/modules/system/language.api.php
index 7c7375f..54c664a 100644
--- a/core/modules/system/language.api.php
+++ b/core/modules/system/language.api.php
@@ -191,7 +191,7 @@ function hook_language_fallback_candidates_alter(array &$fallback_candidates) {
  * // Use the current default interface language.
  * $langcode = language(LANGUAGE_TYPE_INTERFACE)->langcode;
  * // Instantiate the transliteration class.
- * $trans = drupal_container()->get('transliteration');
+ * $trans = Drupal::service('transliteration');
  * // Use this to transliterate some text.
  * $transformed = $trans->transliterate($string, $langcode);
  * @endcode
diff --git a/core/modules/system/lib/Drupal/system/Plugin/PluginUIBase.php b/core/modules/system/lib/Drupal/system/Plugin/PluginUIBase.php
index dd890fd..cc02b18 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/PluginUIBase.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/PluginUIBase.php
@@ -27,7 +27,7 @@ public function form($form, &$form_state) {
       $manager = new $plugin_definition['manager']();
     }
     else {
-      $manager = drupal_container()->get($plugin_definition['manager']);
+      $manager = Drupal::getContainer()->get($plugin_definition['manager']);
     }
     $plugins = $manager->getDefinitions();
 
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/GetFilenameUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/GetFilenameUnitTest.php
index d2d4cc7..a862d1d 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/GetFilenameUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/GetFilenameUnitTest.php
@@ -28,7 +28,7 @@ public static function getInfo() {
   function testDrupalGetFilename() {
     // Assert that the test is meaningful by making sure the keyvalue service
     // does not exist.
-    $this->assertFalse(drupal_container()->has('keyvalue'), 'The container has no keyvalue service.');
+    $this->assertFalse(Drupal::getContainer()->has('keyvalue'), 'The container has no keyvalue service.');
     // Retrieving the location of a module.
     $this->assertIdentical(drupal_get_filename('module', 'php'), 'core/modules/php/php.module', 'Retrieve module location.');
 
diff --git a/core/modules/system/lib/Drupal/system/Tests/Bundle/BundleTest.php b/core/modules/system/lib/Drupal/system/Tests/Bundle/BundleTest.php
index 35faa3c..e286afd 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Bundle/BundleTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Bundle/BundleTest.php
@@ -33,8 +33,8 @@ public static function getInfo() {
    * Tests that services provided by module bundles get registered to the DIC.
    */
   function testBundleRegistration() {
-    $this->assertTrue(drupal_container()->getDefinition('file.usage')->getClass() == 'Drupal\\bundle_test\\TestFileUsage', 'Class has been changed');
-    $this->assertTrue(drupal_container()->has('bundle_test_class'), 'The bundle_test_class service has been registered to the DIC');
+    $this->assertTrue(Drupal::getContainer()->getDefinition('file.usage')->getClass() == 'Drupal\\bundle_test\\TestFileUsage', 'Class has been changed');
+    $this->assertTrue(Drupal::getContainer()->has('bundle_test_class'), 'The bundle_test_class service has been registered to the DIC');
     // The event subscriber method in the test class calls drupal_set_message with
     // a message saying it has fired. This will fire on every page request so it
     // should show up on the front page.
@@ -48,11 +48,11 @@ function testBundleRegistration() {
   function testBundleRegistrationDynamic() {
     // Disable the module and ensure the bundle's service is not registered.
     module_disable(array('bundle_test'));
-    $this->assertFalse(drupal_container()->has('bundle_test_class'), 'The bundle_test_class service does not exist in the DIC.');
+    $this->assertFalse(Drupal::getContainer()->has('bundle_test_class'), 'The bundle_test_class service does not exist in the DIC.');
 
     // Enable the module and ensure the bundle's service is registered.
     module_enable(array('bundle_test'));
-    $this->assertTrue(drupal_container()->has('bundle_test_class'), 'The bundle_test_class service exists in the DIC.');
+    $this->assertTrue(Drupal::getContainer()->has('bundle_test_class'), 'The bundle_test_class service exists in the DIC.');
   }
 
 }
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php
index 3c54ad4..9140347 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php
@@ -200,7 +200,7 @@ function testHeaderSetting() {
     $this->drupalGet('common-test/query-string');
     $this->assertPattern('@<script>.+drupalSettings.+"currentPath":"common-test\\\/query-string"@s', 'currentPath is in the JS settings');
     $path = array('source' => 'common-test/query-string', 'alias' => 'common-test/currentpath-check');
-    drupal_container()->get('path.crud')->save($path['source'], $path['alias']);
+    Drupal::service('path.crud')->save($path['source'], $path['alias']);
     $this->drupalGet('common-test/currentpath-check');
     $this->assertPattern('@<script>.+drupalSettings.+"currentPath":"common-test\\\/query-string"@s', 'currentPath is in the JS settings for an aliased path');
   }
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryRelationshipTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryRelationshipTest.php
index 434311c..4f8ea05 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryRelationshipTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryRelationshipTest.php
@@ -115,7 +115,7 @@ public function setUp() {
       $entity->save();
       $this->entities[] = $entity;
     }
-    $this->factory = drupal_container()->get('entity.query');
+    $this->factory = Drupal::service('entity.query');
   }
 
   /**
diff --git a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryTest.php b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryTest.php
index ae51625..888c098 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Entity/EntityQueryTest.php
@@ -126,7 +126,7 @@ function setUp() {
     }
     $this->figures = $figures;
     $this->greetings = $greetings;
-    $this->factory = drupal_container()->get('entity.query');
+    $this->factory = Drupal::service('entity.query');
   }
 
   /**
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php
index 3de02ce..56b2366 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php
@@ -103,7 +103,7 @@ function testModuleImplements() {
     // cache, as that is expected to happen implicitly by setting the module
     // list. This verifies that the hook implementation cache is cleared
     // whenever setModuleList() is called.
-    $module_handler = drupal_container()->get('module_handler');
+    $module_handler = Drupal::service('module_handler');
     $module_handler->invokeAll('test');
 
     // Make sure group include files are detected properly even when the file is
diff --git a/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php b/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php
index b987739..f19412d 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Path/UrlAlterFunctionalTest.php
@@ -46,7 +46,7 @@ function testUrlAlter() {
 
     // Test that a path always uses its alias.
     $path = array('source' => "user/$uid/test1", 'alias' => 'alias/test1');
-    drupal_container()->get('path.crud')->save($path['source'], $path['alias']);
+    Drupal::service('path.crud')->save($path['source'], $path['alias']);
     $this->assertUrlInboundAlter('alias/test1', "user/$uid/test1");
     $this->assertUrlOutboundAlter("user/$uid/test1", 'alias/test1');
 
@@ -112,7 +112,7 @@ protected function assertUrlOutboundAlter($original, $final) {
    *
    * @param $original
    *   A string with the aliased or un-normal path that is run through
-   *   drupal_container()->get('path.alias_manager')->getSystemPath().
+   *   Drupal::service('path.alias_manager')->getSystemPath().
    * @param $final
    *   A string with the expected result after url().
    * @return
@@ -120,7 +120,7 @@ protected function assertUrlOutboundAlter($original, $final) {
    */
   protected function assertUrlInboundAlter($original, $final) {
     // Test inbound altering.
-    $result = drupal_container()->get('path.alias_manager')->getSystemPath($original);
+    $result = Drupal::service('path.alias_manager')->getSystemPath($original);
     $this->assertIdentical($result, $final, format_string('Altered inbound URL %original, expected %final, and got %result.', array('%original' => $original, '%final' => $final, '%result' => $result)));
   }
 }
diff --git a/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php b/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php
index 2bb96b9..73bcf2d 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Update/UpdateScriptTest.php
@@ -61,7 +61,7 @@ function testUpdateAccess() {
     // Access the update page as user 1.
     $user1 = user_load(1);
     $user1->pass_raw = user_password();
-    $user1->pass = drupal_container()->get('password')->hash(trim($user1->pass_raw));
+    $user1->pass = Drupal::service('password')->hash(trim($user1->pass_raw));
     db_query("UPDATE {users} SET pass = :pass WHERE uid = :uid", array(':pass' => $user1->pass, ':uid' => $user1->uid));
     $this->drupalLogin($user1);
     $this->drupalGet($this->update_url, array('external' => TRUE));
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/ModulesDisabledUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/ModulesDisabledUpgradePathTest.php
index b02d5ff..0052911 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/ModulesDisabledUpgradePathTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/ModulesDisabledUpgradePathTest.php
@@ -37,7 +37,7 @@ public function testDisabledUpgrade() {
     $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.');
 
     // Get enabled modules.
-    $enabled = drupal_container()->get('module_handler')->getModuleList();
+    $enabled = Drupal::service('module_handler')->getModuleList();
     // Get all available modules.
     $available = system_rebuild_module_data();
     // Filter out hidden test modules.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php
index 74c9923..cd9ef4c 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php
@@ -192,7 +192,7 @@ protected function refreshVariables() {
       global $conf;
       cache('bootstrap')->delete('variables');
       $conf = variable_initialize();
-      $container = drupal_container();
+      $container = Drupal::getContainer();
       if ($container->has('config.factory')) {
         $container->get('config.factory')->reset();
       }
@@ -283,8 +283,8 @@ protected function performUpgrade($register_errors = TRUE) {
 
     // Reload module list for modules that are enabled in the test database
     // but not on the test client.
-    drupal_container()->get('module_handler')->resetImplementations();
-    drupal_container()->get('module_handler')->reload();
+    Drupal::service('module_handler')->resetImplementations();
+    Drupal::service('module_handler')->reload();
 
     // Rebuild the container and all caches.
     $this->rebuildContainer();
diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index 4a4ba0e..a1cc5ad 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -1232,7 +1232,7 @@ function system_modules_submit($form, &$form_state) {
 
   // Gets list of modules prior to install process, unsets $form_state['storage']
   // so we don't get redirected back to the confirmation form.
-  $pre_install_list = drupal_container()->get('module_handler')->getModuleList();
+  $pre_install_list = Drupal::service('module_handler')->getModuleList();
   unset($form_state['storage']);
 
   // Reverse the 'enable' list, to order dependencies before dependents.
@@ -1244,7 +1244,7 @@ function system_modules_submit($form, &$form_state) {
 
   // Gets module list after install process, flushes caches and displays a
   // message if there are changes.
-  $post_install_list = drupal_container()->get('module_handler')->getModuleList();
+  $post_install_list = Drupal::service('module_handler')->getModuleList();
   if ($pre_install_list != $post_install_list) {
     drupal_flush_all_caches();
     drupal_set_message(t('The configuration options have been saved.'));
@@ -1440,7 +1440,7 @@ function system_site_information_settings($form, &$form_state) {
     '#type' => 'details',
     '#title' => t('Front page'),
   );
-  $front_page = $site_config->get('page.front') != 'user' ? drupal_container()->get('path.alias_manager')->getPathAlias($site_config->get('page.front')) : '';
+  $front_page = $site_config->get('page.front') != 'user' ? Drupal::service('path.alias_manager')->getPathAlias($site_config->get('page.front')) : '';
   $form['front_page']['site_frontpage'] = array(
     '#type' => 'textfield',
     '#title' => t('Default front page'),
@@ -1486,7 +1486,7 @@ function system_site_information_settings_validate($form, &$form_state) {
   }
   else {
     // Get the normal path of the front page.
-    form_set_value($form['front_page']['site_frontpage'], drupal_container()->get('path.alias_manager')->getSystemPath($form_state['values']['site_frontpage']), $form_state);
+    form_set_value($form['front_page']['site_frontpage'], Drupal::service('path.alias_manager')->getSystemPath($form_state['values']['site_frontpage']), $form_state);
   }
   // Validate front page path.
   if (!drupal_valid_path($form_state['values']['site_frontpage'])) {
@@ -1494,10 +1494,10 @@ function system_site_information_settings_validate($form, &$form_state) {
   }
   // Get the normal paths of both error pages.
   if (!empty($form_state['values']['site_403'])) {
-    form_set_value($form['error_page']['site_403'], drupal_container()->get('path.alias_manager')->getSystemPath($form_state['values']['site_403']), $form_state);
+    form_set_value($form['error_page']['site_403'], Drupal::service('path.alias_manager')->getSystemPath($form_state['values']['site_403']), $form_state);
   }
   if (!empty($form_state['values']['site_404'])) {
-    form_set_value($form['error_page']['site_404'], drupal_container()->get('path.alias_manager')->getSystemPath($form_state['values']['site_404']), $form_state);
+    form_set_value($form['error_page']['site_404'], Drupal::service('path.alias_manager')->getSystemPath($form_state['values']['site_404']), $form_state);
   }
   // Validate 403 error path.
   if (!empty($form_state['values']['site_403']) && !drupal_valid_path($form_state['values']['site_403'])) {
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 882a049..4639bf3 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -414,7 +414,7 @@ function system_requirements($phase) {
     );
 
     // Check installed modules.
-    foreach (drupal_container()->get('module_handler')->getModuleList() as $module => $filename) {
+    foreach (Drupal::service('module_handler')->getModuleList() as $module => $filename) {
       $updates = drupal_get_schema_versions($module);
       if ($updates !== FALSE) {
         $default = drupal_get_installed_schema_version($module);
@@ -2051,10 +2051,10 @@ function system_update_8046() {
     update_module_enable(array('views'));
 
     // Register views to the container, so views can use it's services.
-    $module_list = drupal_container()->getParameter('container.modules');
+    $module_list = Drupal::getContainer()->getParameter('container.modules');
     drupal_load('module', 'views');
 
-    drupal_container()->get('kernel')->updateModules(array_keys($module_list), array('views' => 'core/modules/views/views.module'));
+    Drupal::service('kernel')->updateModules(array_keys($module_list), array('views' => 'core/modules/views/views.module'));
 
     // This does not fire a hook just calls views.
     config_install_default_config('module', 'views');
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 2c51ae0..b5a8a24 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -1073,7 +1073,7 @@ function system_menu() {
     );
   }
 
-  foreach (drupal_container()->get('plugin.manager.system.plugin_ui')->getDefinitions() as $plugin_id => $plugin) {
+  foreach (Drupal::service('plugin.manager.system.plugin_ui')->getDefinitions() as $plugin_id => $plugin) {
     if ($plugin['menu'] === TRUE) {
       $items[$plugin['path'] . '/' . $plugin_id . '/' . $plugin['suffix']] = array(
         'title' => $plugin['title'],
@@ -1126,7 +1126,7 @@ function system_menu() {
  *   documentation. Also "proxies" is a weird word to use.
  */
 function system_plugin_ui_form($form, &$form_state, $plugin, $facet = NULL) {
-  $plugin_ui = drupal_container()->get('plugin.manager.system.plugin_ui')->createInstance($plugin);
+  $plugin_ui = Drupal::service('plugin.manager.system.plugin_ui')->createInstance($plugin);
   $form = $plugin_ui->form($form, $form_state, $facet);
   $form['#validate'][] = array($plugin_ui, 'formValidate');
   $form['#submit'][] = array($plugin_ui, 'formSubmit');
@@ -1147,12 +1147,12 @@ function system_plugin_ui_form($form, &$form_state, $plugin, $facet = NULL) {
  * @return object JsonResponse
  */
 function system_plugin_autocomplete($plugin_id) {
-  $string_typed = drupal_container()->get('request')->query->get('q');
+  $string_typed = Drupal::service('request')->query->get('q');
   $string_typed = drupal_explode_tags($string_typed);
   $string = drupal_strtolower(array_pop($string_typed));
   $matches = array();
   if ($string) {
-    $plugin_ui = drupal_container()->get('plugin.manager.system.plugin_ui')->getDefinition($plugin_id);
+    $plugin_ui = Drupal::service('plugin.manager.system.plugin_ui')->getDefinition($plugin_id);
     $manager = new $plugin_ui['manager']();
     $titles = array();
     foreach($manager->getDefinitions() as $plugin_id => $plugin) {
@@ -1171,7 +1171,7 @@ function system_plugin_autocomplete($plugin_id) {
  * @todo What the heck kind of parameter name is "facet"?
  */
 function system_plugin_ui_access($plugin, $facet = NULL) {
-  $plugin_ui = drupal_container()->get('plugin.manager.system.plugin_ui')->createInstance($plugin);
+  $plugin_ui = Drupal::service('plugin.manager.system.plugin_ui')->createInstance($plugin);
   return $plugin_ui->access($facet);
 }
 
@@ -1180,7 +1180,7 @@ function system_plugin_ui_access($plugin, $facet = NULL) {
  */
 function system_forms() {
   $forms = array();
-  foreach (drupal_container()->get('plugin.manager.system.plugin_ui')->getDefinitions() as $plugin_id => $plugin) {
+  foreach (Drupal::service('plugin.manager.system.plugin_ui')->getDefinitions() as $plugin_id => $plugin) {
     if (empty($forms[$plugin['id']])) {
       $forms[$plugin['id']]['callback'] = 'system_plugin_ui_form';
     }
@@ -2556,8 +2556,8 @@ function system_get_localized_date_format($languages) {
  * Implements hook_custom_theme().
  */
 function system_custom_theme() {
-  if (drupal_container()->isScopeActive('request')) {
-    $request = drupal_container()->get('request');
+  if (Drupal::getContainer()->isScopeActive('request')) {
+    $request = Drupal::service('request');
     $path = $request->attributes->get('system_path');
     if (user_access('view the administration theme') && path_is_admin($path)) {
       return config('system.theme')->get('admin');
@@ -2780,7 +2780,7 @@ function system_get_info($type, $name = NULL) {
   $info = array();
   if ($type == 'module') {
     $data = system_rebuild_module_data();
-    foreach (drupal_container()->get('module_handler')->getModuleList() as $module => $filename) {
+    foreach (Drupal::service('module_handler')->getModuleList() as $module => $filename) {
       $info[$module] = $data[$module]->info;
     }
   }
@@ -2923,7 +2923,7 @@ function system_rebuild_module_data() {
       $record->schema_version = SCHEMA_UNINSTALLED;
       $files[$module] = $record->filename;
     }
-    $modules = drupal_container()->get('module_handler')->buildModuleDependencies($modules);
+    $modules = Drupal::service('module_handler')->buildModuleDependencies($modules);
     $modules_cache = $modules;
 
     // Store filenames to allow system_list() and drupal_get_filename() to
diff --git a/core/modules/system/tests/modules/condition_test/lib/Drupal/condition_test/FormController.php b/core/modules/system/tests/modules/condition_test/lib/Drupal/condition_test/FormController.php
index 93c3603..6e171e3 100644
--- a/core/modules/system/tests/modules/condition_test/lib/Drupal/condition_test/FormController.php
+++ b/core/modules/system/tests/modules/condition_test/lib/Drupal/condition_test/FormController.php
@@ -33,7 +33,7 @@ public function getFormID() {
    * Constructs a \Drupal\condition_test\FormController object.
    */
   public function __construct() {
-    $manager = new ConditionManager(drupal_container()->getParameter('container.namespaces'));
+    $manager = new ConditionManager(Drupal::getContainer()->getParameter('container.namespaces'));
     $this->condition = $manager->createInstance('node_type');
   }
 
diff --git a/core/modules/system/tests/modules/design_test/design_test.module b/core/modules/system/tests/modules/design_test/design_test.module
index a7ab1b5..04b6080 100644
--- a/core/modules/system/tests/modules/design_test/design_test.module
+++ b/core/modules/system/tests/modules/design_test/design_test.module
@@ -97,7 +97,7 @@ function design_test_menu_local_tasks_alter(&$data, $router_item, $root_path) {
   if ($router_item['number_parts'] > 2 && strpos($root_path, 'design_test/') === 0) {
     $actions = &$data['actions']['output'];
     // Determine the currently selected theme, if any.
-    $selected_theme = drupal_container()->get('request')->query->get('theme');
+    $selected_theme = Drupal::service('request')->query->get('theme');
     $default_theme = config('system.theme')->get('default');
 
     // Expand all enabled themes into action links.
@@ -131,7 +131,7 @@ function design_test_menu_local_tasks_alter(&$data, $router_item, $root_path) {
  * query parameter. The returned value is validated by the menu system already.
  */
 function design_test_menu_theme_callback() {
-  return drupal_container()->get('request')->query->get('theme');
+  return Drupal::service('request')->query->get('theme');
 }
 
 /**
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php
index 91d78ea..fdeb5e3 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php
@@ -98,7 +98,7 @@ public function query() {
       $def['table formula'] = $query;
     }
 
-    $join = drupal_container()->get('plugin.manager.views.join')->createInstance('standard', $def);
+    $join = Drupal::service('plugin.manager.views.join')->createInstance('standard', $def);
 
     // use a short alias for this:
     $alias = $def['table'] . '_' . $this->table;
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index f894d6c..09810f8 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -576,7 +576,7 @@ function taxonomy_term_is_page(Term $term) {
  * Clear all static cache variables for terms.
  */
 function taxonomy_terms_static_reset() {
-  drupal_container()->get('plugin.manager.entity')->getStorageController('taxonomy_term')->resetCache();
+  Drupal::service('plugin.manager.entity')->getStorageController('taxonomy_term')->resetCache();
 }
 
 /**
@@ -586,7 +586,7 @@ function taxonomy_terms_static_reset() {
  *   An array of ids to reset in entity controller cache.
  */
 function taxonomy_vocabulary_static_reset(array $ids = NULL) {
-  drupal_container()->get('plugin.manager.entity')->getStorageController('taxonomy_vocabulary')->resetCache($ids);
+  Drupal::service('plugin.manager.entity')->getStorageController('taxonomy_vocabulary')->resetCache($ids);
 }
 
 /**
diff --git a/core/modules/taxonomy/taxonomy.pages.inc b/core/modules/taxonomy/taxonomy.pages.inc
index b6f1329..d75cff4 100644
--- a/core/modules/taxonomy/taxonomy.pages.inc
+++ b/core/modules/taxonomy/taxonomy.pages.inc
@@ -106,7 +106,7 @@ function taxonomy_term_feed(Term $term) {
 function taxonomy_autocomplete($field_name) {
   // A comma-separated list of term names entered in the autocomplete form
   // element. Only the last term is used for autocompletion.
-  $tags_typed = drupal_container()->get('request')->query->get('q');
+  $tags_typed = Drupal::service('request')->query->get('q');
 
   // Make sure the field exists and is a taxonomy field.
   if (!($field = field_info_field($field_name)) || $field['type'] !== 'taxonomy_term_reference') {
diff --git a/core/modules/taxonomy/taxonomy.views.inc b/core/modules/taxonomy/taxonomy.views.inc
index 0644f82..6691cd0 100644
--- a/core/modules/taxonomy/taxonomy.views.inc
+++ b/core/modules/taxonomy/taxonomy.views.inc
@@ -177,7 +177,7 @@ function taxonomy_views_data() {
   );
 
   // Entity translation field.
-  if (drupal_container()->get('module_handler')->moduleExists('translation_entity')) {
+  if (Drupal::service('module_handler')->moduleExists('translation_entity')) {
     $data['taxonomy_term_data']['translation_link'] = array(
       'title' => t('Translation link'),
       'help' => t('Provide a link to the translations overview for taxonomy terms.'),
diff --git a/core/modules/tour/lib/Drupal/tour/Plugin/Core/Entity/Tour.php b/core/modules/tour/lib/Drupal/tour/Plugin/Core/Entity/Tour.php
index 9d5b7cb..1386fb7 100644
--- a/core/modules/tour/lib/Drupal/tour/Plugin/Core/Entity/Tour.php
+++ b/core/modules/tour/lib/Drupal/tour/Plugin/Core/Entity/Tour.php
@@ -74,7 +74,7 @@ class Tour extends ConfigEntityBase {
   public function __construct(array $values, $entity_type) {
     parent::__construct($values, $entity_type);
 
-    $this->tipsBag = new TipsBag(drupal_container()->get('plugin.manager.tour.tip'), $this->tips);
+    $this->tipsBag = new TipsBag(Drupal::service('plugin.manager.tour.tip'), $this->tips);
   }
 
   /**
diff --git a/core/modules/tour/tour.api.php b/core/modules/tour/tour.api.php
index 548622e..f47cbdf 100644
--- a/core/modules/tour/tour.api.php
+++ b/core/modules/tour/tour.api.php
@@ -57,7 +57,7 @@ function hook_tour_presave($entity) {
  *   The tour object being inserted.
  */
 function hook_tour_insert($entity) {
-  drupal_container()->get('plugin.manager.tour.tip')->clearCachedDefinitions();
+  Drupal::service('plugin.manager.tour.tip')->clearCachedDefinitions();
   cache('cache_tour')->deleteTags(array('tour_items'));
 }
 
@@ -68,6 +68,6 @@ function hook_tour_insert($entity) {
  *   The tour object being updated.
  */
 function hook_tour_update($entity) {
-  drupal_container()->get('plugin.manager.tour.tip')->clearCachedDefinitions();
+  Drupal::service('plugin.manager.tour.tip')->clearCachedDefinitions();
   cache('cache_tour')->deleteTags(array('tour_items'));
 }
diff --git a/core/modules/tour/tour.module b/core/modules/tour/tour.module
index f26b356..8867bb9 100644
--- a/core/modules/tour/tour.module
+++ b/core/modules/tour/tour.module
@@ -120,7 +120,7 @@ function tour_preprocess_page(&$variables) {
     ->execute();
   $tours = entity_load_multiple('tour', $tour_ids);
 
-  $path_alias = drupal_strtolower(drupal_container()->get('path.alias_manager')->getPathAlias($path));
+  $path_alias = drupal_strtolower(Drupal::service('path.alias_manager')->getPathAlias($path));
   foreach ($tours as $tour) {
     // @todo replace this with an entity_query() that does path matching when
     // http://drupal.org/node/1918768 lands.
@@ -133,7 +133,7 @@ function tour_preprocess_page(&$variables) {
   }
 
   // Allow other modules to alter.
-  drupal_container()->get('module_handler')->alter('tour_tips', $tour_items, $path);
+  Drupal::service('module_handler')->alter('tour_tips', $tour_items, $path);
 
   if (empty($tour_items)) {
     return;
@@ -204,12 +204,12 @@ function tour_preprocess_page(&$variables) {
  * Implements hook_tour_insert().
  */
 function tour_tour_insert($entity) {
-  drupal_container()->get('plugin.manager.tour.tip')->clearCachedDefinitions();
+  Drupal::service('plugin.manager.tour.tip')->clearCachedDefinitions();
 }
 
 /**
  * Implements hook_tour_update().
  */
 function tour_tour_update($entity) {
-  drupal_container()->get('plugin.manager.tour.tip')->clearCachedDefinitions();
+  Drupal::service('plugin.manager.tour.tip')->clearCachedDefinitions();
 }
diff --git a/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationController.php b/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationController.php
index ce9d3a0..1c6c723 100644
--- a/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationController.php
+++ b/core/modules/translation_entity/lib/Drupal/translation_entity/EntityTranslationController.php
@@ -434,7 +434,7 @@ public function entityFormEntityBuild($entity_type, EntityInterface $entity, arr
     // Set contextual information that can be reused during the storage phase.
     // @todo Remove this once we have an EntityLanguageDecorator to deal with
     //   the active language.
-    $attributes = drupal_container()->get('request')->attributes;
+    $attributes = Drupal::service('request')->attributes;
     $attributes->set('working_langcode', $form_langcode);
     $attributes->set('source_langcode', $source_langcode);
   }
diff --git a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationSyncImageTest.php b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationSyncImageTest.php
index 61f93cf..311cab9 100644
--- a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationSyncImageTest.php
+++ b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationSyncImageTest.php
@@ -92,7 +92,7 @@ function testImageFieldSync() {
     $langcode = $this->langcodes[1];
 
     // Populate the required contextual values.
-    $attributes = drupal_container()->get('request')->attributes;
+    $attributes = Drupal::service('request')->attributes;
     $attributes->set('working_langcode', $langcode);
     $attributes->set('source_langcode', $default_langcode);
 
diff --git a/core/modules/translation_entity/translation_entity.module b/core/modules/translation_entity/translation_entity.module
index b99fdcf..5cedee9 100644
--- a/core/modules/translation_entity/translation_entity.module
+++ b/core/modules/translation_entity/translation_entity.module
@@ -867,7 +867,7 @@ function translation_entity_field_info_alter(&$info) {
  */
 function translation_entity_field_attach_presave(EntityInterface $entity) {
   if (translation_entity_enabled($entity->entityType(), $entity->bundle())) {
-    $attributes = drupal_container()->get('request')->attributes;
+    $attributes = Drupal::service('request')->attributes;
     Drupal::service('translation_entity.synchronizer')->synchronizeFields($entity, $attributes->get('working_langcode'), $attributes->get('source_langcode'));
   }
 }
diff --git a/core/modules/translation_entity/translation_entity.pages.inc b/core/modules/translation_entity/translation_entity.pages.inc
index f0c3027..cb07ad4 100644
--- a/core/modules/translation_entity/translation_entity.pages.inc
+++ b/core/modules/translation_entity/translation_entity.pages.inc
@@ -292,7 +292,7 @@ function translation_entity_delete_confirm_submit(array $form, array &$form_stat
   // @todo This should be taken care of by the Path module.
   if (module_exists('path')) {
     $conditions = array('source' => $controller->getViewPath($entity), 'langcode' => $language->langcode);
-    drupal_container()->get('path.crud')->delete($conditions);
+    Drupal::service('path.crud')->delete($conditions);
   }
 
   $form_state['redirect'] = $controller->getBasePath($entity) . '/translations';
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php
index 057b4da..7a31cf9 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php
@@ -40,7 +40,7 @@ class UserData extends FieldPluginBase {
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
 
-    $this->userData = drupal_container()->get('user.data');
+    $this->userData = Drupal::service('user.data');
   }
 
   /**
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php b/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
index 70623bd..4d81557 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
@@ -70,7 +70,7 @@ function testUserCancelUid1() {
     $password = user_password();
     $account = array(
       'name' => 'user1',
-      'pass' => drupal_container()->get('password')->hash(trim($password)),
+      'pass' => Drupal::service('password')->hash(trim($password)),
     );
     // We cannot use $account->save() here, because this would result in the
     // password being hashed again.
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserLoginTest.php b/core/modules/user/lib/Drupal/user/Tests/UserLoginTest.php
index 36c5f47..d00a750 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserLoginTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserLoginTest.php
@@ -107,7 +107,7 @@ function testPasswordRehashOnLogin() {
     $default_count_log2 = 16;
 
     // Retrieve instance of password hashing algorithm
-    $password_hasher = drupal_container()->get('password');
+    $password_hasher = Drupal::service('password');
 
     // Create a new user and authenticate.
     $account = $this->drupalCreateUser(array());
diff --git a/core/modules/user/lib/Drupal/user/UserStorageController.php b/core/modules/user/lib/Drupal/user/UserStorageController.php
index 3d8e981..7853b74 100644
--- a/core/modules/user/lib/Drupal/user/UserStorageController.php
+++ b/core/modules/user/lib/Drupal/user/UserStorageController.php
@@ -75,7 +75,7 @@ protected function preSave(EntityInterface $entity) {
     // Update the user password if it has changed.
     if ($entity->isNew() || (!empty($entity->pass) && $entity->pass != $entity->original->pass)) {
       // Allow alternate password hashing schemes.
-      $entity->pass = drupal_container()->get('password')->hash(trim($entity->pass));
+      $entity->pass = Drupal::service('password')->hash(trim($entity->pass));
       // Abort if the hashing failed and returned FALSE.
       if (!$entity->pass) {
         throw new EntityMalformedException('The entity does not have a password.');
@@ -98,7 +98,7 @@ protected function preSave(EntityInterface $entity) {
     // Store account cancellation information.
     foreach (array('user_cancel_method', 'user_cancel_notify') as $key) {
       if (isset($entity->{$key})) {
-        drupal_container()->get('user.data')->set('user', $entity->id(), substr($key, 5), $entity->{$key});
+        Drupal::service('user.data')->set('user', $entity->id(), substr($key, 5), $entity->{$key});
       }
     }
   }
@@ -175,6 +175,6 @@ protected function postDelete($entities) {
     db_delete('users_roles')
       ->condition('uid', array_keys($entities), 'IN')
       ->execute();
-    drupal_container()->get('user.data')->delete(NULL, array_keys($entities));
+    Drupal::service('user.data')->delete(NULL, array_keys($entities));
   }
 }
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index bdf5862..5138542 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -656,7 +656,7 @@ function user_validate_current_pass(&$form, &$form_state) {
     // form values like password_confirm that have their own validation
     // that prevent them from being empty if they are changed.
     if ((strlen(trim($form_state['values'][$key])) > 0) && ($form_state['values'][$key] != $account->$key)) {
-      $current_pass_failed = empty($form_state['values']['current_pass']) || !drupal_container()->get('password')->check($form_state['values']['current_pass'], $account);
+      $current_pass_failed = empty($form_state['values']['current_pass']) || !Drupal::service('password')->check($form_state['values']['current_pass'], $account);
       if ($current_pass_failed) {
         form_set_error('current_pass', t("Your current password is missing or incorrect; it's required to change the %name.", array('%name' => $name)));
         form_set_error($key);
@@ -1395,7 +1395,7 @@ function user_authenticate($name, $password) {
   if (!empty($name) && !empty($password)) {
     $account = user_load_by_name($name);
     if ($account) {
-      $password_hasher = drupal_container()->get('password');
+      $password_hasher = Drupal::service('password');
       if ($password_hasher->check($password, $account)) {
         // Successful authentication.
         $uid = $account->uid;
@@ -2597,7 +2597,7 @@ function user_modules_uninstalled($modules) {
      ->condition('module', $modules, 'IN')
      ->execute();
   // Remove any potentially orphan module data stored for users.
-  drupal_container()->get('user.data')->delete($modules);
+  Drupal::service('user.data')->delete($modules);
 }
 
 /**
diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc
index 6559313..8ada89a 100644
--- a/core/modules/user/user.pages.inc
+++ b/core/modules/user/user.pages.inc
@@ -373,7 +373,7 @@ function user_cancel_confirm($account, $timestamp = 0, $hashed_pass = '') {
   $current = REQUEST_TIME;
 
   // Basic validation of arguments.
-  $account_data = drupal_container()->get('user.data')->get('user', $account->id());
+  $account_data = Drupal::service('user.data')->get('user', $account->id());
   if (isset($account_data['cancel_method']) && !empty($timestamp) && !empty($hashed_pass)) {
     // Validate expiration and hashed password/login.
     if ($timestamp <= $current && $current - $timestamp < $timeout && $account->uid && $timestamp >= $account->login && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) {
diff --git a/core/modules/user/user.views.inc b/core/modules/user/user.views.inc
index 13b1690..a012036 100644
--- a/core/modules/user/user.views.inc
+++ b/core/modules/user/user.views.inc
@@ -279,7 +279,7 @@ function user_views_data() {
     ),
   );
 
-  if (drupal_container()->get('module_handler')->moduleExists('translation_entity')) {
+  if (Drupal::service('module_handler')->moduleExists('translation_entity')) {
     $data['users']['translation_link'] = array(
       'title' => t('Translation link'),
       'help' => t('Provide a link to the translations overview for users.'),
diff --git a/core/modules/views/includes/ajax.inc b/core/modules/views/includes/ajax.inc
index 65ecd3f..06107ce 100644
--- a/core/modules/views/includes/ajax.inc
+++ b/core/modules/views/includes/ajax.inc
@@ -23,7 +23,7 @@
  * Menu callback to load a view via AJAX.
  */
 function views_ajax() {
-  $request = drupal_container()->get('request');
+  $request = Drupal::service('request');
   $name = $request->request->get('view_name');
   $display_id = $request->request->get('view_display_id');
   if (isset($name) && isset($display_id)) {
@@ -152,7 +152,7 @@ function views_ajax_form_wrapper($form_id, &$form_state) {
  */
 function views_ajax_autocomplete_taxonomy($vid) {
   // The user enters a comma-separated list of tags. We only autocomplete the last tag.
-  $tags_typed = drupal_explode_tags(drupal_container()->get('request')->query->get('q'));
+  $tags_typed = drupal_explode_tags(Drupal::service('request')->query->get('q'));
   $tag_last = drupal_strtolower(array_pop($tags_typed));
 
   $matches = array();
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php b/core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php
index 71a6910..a8f9719 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Core/Entity/View.php
@@ -130,7 +130,7 @@ class View extends ConfigEntityBase implements ViewStorageInterface {
   public function get($property_name, $langcode = NULL) {
     // Ensure that an executable View is available.
     if ($property_name == 'executable' && !isset($this->{$property_name})) {
-      $this->set('executable', drupal_container()->get('views.executable')->get($this));
+      $this->set('executable', Drupal::service('views.executable')->get($this));
     }
 
     return parent::get($property_name, $langcode);
@@ -191,7 +191,7 @@ public function addDisplay($plugin_id = 'page', $title = NULL, $id = NULL) {
       return FALSE;
     }
 
-    $plugin = drupal_container()->get('plugin.manager.views.display')->getDefinition($plugin_id);
+    $plugin = Drupal::service('plugin.manager.views.display')->getDefinition($plugin_id);
     if (empty($plugin)) {
       $plugin['title'] = t('Broken');
     }
@@ -308,7 +308,7 @@ public function &getDisplay($display_id) {
    *   An array of display types that this view includes.
    */
   function getDisplaysList() {
-    $manager = drupal_container()->get('plugin.manager.views.display');
+    $manager = Drupal::service('plugin.manager.views.display');
     $displays = array();
     foreach ($this->display as $display) {
       $definition = $manager->getDefinition($display['display_plugin']);
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/DefaultWizardDeriver.php b/core/modules/views/lib/Drupal/views/Plugin/Derivative/DefaultWizardDeriver.php
index 47af258..0b36471 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Derivative/DefaultWizardDeriver.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Derivative/DefaultWizardDeriver.php
@@ -35,7 +35,7 @@ public function getDerivativeDefinition($derivative_id, array $base_plugin_defin
    * Implements Drupal\Component\Plugin\Derivative\DerivativeInterface::getDerivativeDefinitions().
    */
   public function getDerivativeDefinitions(array $base_plugin_definition) {
-    $views_data = drupal_container()->get('views.views_data');
+    $views_data = Drupal::service('views.views_data');
     $base_tables = array_keys($views_data->fetchBaseTables());
     $this->derivatives = array();
     foreach ($base_tables as $table) {
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
index 94b4a3b..3a94bf2 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
@@ -645,7 +645,7 @@ public function getDateField() {
    * @return Drupal\views\Plugin\views\join\JoinPluginBase
    */
   public static function getTableJoin($table, $base_table) {
-    $data = drupal_container()->get('views.views_data')->get($table);
+    $data = Drupal::service('views.views_data')->get($table);
     if (isset($data['table']['join'][$base_table])) {
       $join_info = $data['table']['join'][$base_table];
       if (!empty($join_info['join_id'])) {
@@ -671,7 +671,7 @@ public static function getTableJoin($table, $base_table) {
         }
       }
 
-      $join = drupal_container()->get('plugin.manager.views.join')->createInstance($id, $configuration);
+      $join = Drupal::service('plugin.manager.views.join')->createInstance($id, $configuration);
 
       return $join;
     }
@@ -690,10 +690,10 @@ public function getEntityType() {
     // If the user has configured a relationship on the handler take that into
     // account.
     if (!empty($this->options['relationship']) && $this->options['relationship'] != 'none') {
-      $views_data = drupal_container()->get('views.views_data')->get($this->view->relationship->table);
+      $views_data = Drupal::service('views.views_data')->get($this->view->relationship->table);
     }
     else {
-      $views_data = drupal_container()->get('views.views_data')->get($this->view->storage->get('base_table'));
+      $views_data = Drupal::service('views.views_data')->get($this->view->storage->get('base_table'));
     }
 
     if (isset($views_data['table']['entity type'])) {
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
index a7bd33e..5fc7aad 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
@@ -301,7 +301,7 @@ public function buildOptionsForm(&$form, &$form_state) {
       ),
     );
 
-    $plugins = drupal_container()->get('plugin.manager.views.argument_validator')->getDefinitions();
+    $plugins = Drupal::service('plugin.manager.views.argument_validator')->getDefinitions();
     foreach ($plugins as $id => $info) {
       if (!empty($info['no_ui'])) {
         continue;
@@ -497,7 +497,7 @@ function default_actions($which = NULL) {
    * default action is set to provide default argument.
    */
   function default_argument_form(&$form, &$form_state) {
-    $plugins = drupal_container()->get('plugin.manager.views.argument_default')->getDefinitions();
+    $plugins = Drupal::service('plugin.manager.views.argument_default')->getDefinitions();
     $options = array();
 
     $form['default_argument_skip_url'] = array(
@@ -562,7 +562,7 @@ function default_argument_form(&$form, &$form_state) {
    * default action is set to display one.
    */
   function default_summary_form(&$form, &$form_state) {
-    $style_plugins = drupal_container()->get('plugin.manager.views.style')->getDefinitions();
+    $style_plugins = Drupal::service('plugin.manager.views.style')->getDefinitions();
     $summary_plugins = array();
     $format_options = array();
     foreach ($style_plugins as $key => $plugin) {
@@ -1056,7 +1056,7 @@ function get_plugin($type = 'argument_default', $name = NULL) {
       $options = $this->options[$options_name];
     }
 
-    $plugin = drupal_container()->get("plugin.manager.views.$type")->createInstance($name);
+    $plugin = Drupal::service('plugin.manager.views.$type')->createInstance($name);
     if ($plugin) {
       $plugin->init($this->view, $this->displayHandler, $options);
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index 3259815..f5c8633 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -105,7 +105,7 @@ public function initDisplay(ViewExecutable $view, array &$display, array &$optio
     $this->extender = array();
     $extenders = views_get_enabled_display_extenders();
     if (!empty($extenders)) {
-      $manager = drupal_container()->get('plugin.manager.views.display_extender');
+      $manager = Drupal::service('plugin.manager.views.display_extender');
       foreach ($extenders as $extender) {
         $plugin = $manager->createInstance($extender);
         if ($plugin) {
@@ -798,13 +798,13 @@ public function getPlugin($type) {
 
     // Query plugins allow specifying a specific query class per base table.
     if ($type == 'query') {
-      $views_data = drupal_container()->get('views.views_data')->get($this->view->storage->get('base_table'));
+      $views_data = Drupal::service('views.views_data')->get($this->view->storage->get('base_table'));
       $name = isset($views_data['table']['base']['query_id']) ? $views_data['table']['base']['query_id'] : 'views_query';
     }
 
     // Plugin instances are stored on the display for re-use.
     if (!isset($this->plugins[$type][$name])) {
-      $plugin = drupal_container()->get("plugin.manager.views.$type")->createInstance($name);
+      $plugin = Drupal::service('plugin.manager.views.$type')->createInstance($name);
 
       // Initialize the plugin.
       $plugin->init($this->view, $this, $options['options']);
@@ -1148,7 +1148,7 @@ public function optionsSummary(&$categories, &$options) {
     $pager_plugin = $this->getPlugin('pager');
     if (!$pager_plugin) {
       // default to the no pager plugin.
-      $pager_plugin = drupal_container()->get('plugin.manager.views.pager')->createInstance('none');
+      $pager_plugin = Drupal::service('plugin.manager.views.pager')->createInstance('none');
     }
 
     $pager_str = $pager_plugin->summaryTitle();
@@ -1214,7 +1214,7 @@ public function optionsSummary(&$categories, &$options) {
     $access_plugin = $this->getPlugin('access');
     if (!$access_plugin) {
       // default to the no access control plugin.
-      $access_plugin = drupal_container()->get('plugin.manager.views.access')->createInstance('none');
+      $access_plugin = Drupal::service('plugin.manager.views.access')->createInstance('none');
     }
 
     $access_str = $access_plugin->summaryTitle();
@@ -1234,7 +1234,7 @@ public function optionsSummary(&$categories, &$options) {
     $cache_plugin = $this->getPlugin('cache');
     if (!$cache_plugin) {
       // default to the no cache control plugin.
-      $cache_plugin = drupal_container()->get('plugin.manager.views.cache')->createInstance('none');
+      $cache_plugin = Drupal::service('plugin.manager.views.cache')->createInstance('none');
     }
 
     $cache_str = $cache_plugin->summaryTitle();
@@ -1280,7 +1280,7 @@ public function optionsSummary(&$categories, &$options) {
     $exposed_form_plugin = $this->getPlugin('exposed_form');
     if (!$exposed_form_plugin) {
       // default to the no cache control plugin.
-      $exposed_form_plugin = drupal_container()->get('plugin.manager.views.exposed_form')->createInstance('basic');
+      $exposed_form_plugin = Drupal::service('plugin.manager.views.exposed_form')->createInstance('basic');
     }
 
     $exposed_form_str = $exposed_form_plugin->summaryTitle();
@@ -1709,7 +1709,7 @@ public function buildOptionsForm(&$form, &$form_state) {
         break;
       case 'analyze-theme':
         $form['#title'] .= t('Theming information');
-        if ($theme = drupal_container()->get('request')->request->get('theme')) {
+        if ($theme = Drupal::service('request')->request->get('theme')) {
           $this->theme = $theme;
         }
         elseif (empty($this->theme)) {
@@ -2154,7 +2154,7 @@ public function submitOptionsForm(&$form, &$form_state) {
       case 'access':
         $access = $this->getOption('access');
         if ($access['type'] != $form_state['values']['access']['type']) {
-          $plugin = drupal_container()->get('plugin.manager.views.access')->createInstance($form_state['values']['access']['type']);
+          $plugin = Drupal::service('plugin.manager.views.access')->createInstance($form_state['values']['access']['type']);
           if ($plugin) {
             $access = array('type' => $form_state['values']['access']['type']);
             $this->setOption('access', $access);
@@ -2177,7 +2177,7 @@ public function submitOptionsForm(&$form, &$form_state) {
       case 'cache':
         $cache = $this->getOption('cache');
         if ($cache['type'] != $form_state['values']['cache']['type']) {
-          $plugin = drupal_container()->get('plugin.manager.views.cache')->createInstance($form_state['values']['cache']['type']);
+          $plugin = Drupal::service('plugin.manager.views.cache')->createInstance($form_state['values']['cache']['type']);
           if ($plugin) {
             $cache = array('type' => $form_state['values']['cache']['type']);
             $this->setOption('cache', $cache);
@@ -2236,7 +2236,7 @@ public function submitOptionsForm(&$form, &$form_state) {
         // the plugin.
         $row = $this->getOption('row');
         if ($row['type'] != $form_state['values'][$section]) {
-          $plugin = drupal_container()->get('plugin.manager.views.row')->createInstance($form_state['values'][$section]);
+          $plugin = Drupal::service('plugin.manager.views.row')->createInstance($form_state['values'][$section]);
           if ($plugin) {
             $row = array('type' => $form_state['values'][$section]);
             $this->setOption($section, $row);
@@ -2253,7 +2253,7 @@ public function submitOptionsForm(&$form, &$form_state) {
         // the plugin.
         $style = $this->getOption('style');
         if ($style['type'] != $form_state['values'][$section]) {
-          $plugin = drupal_container()->get('plugin.manager.views.style')->createInstance($form_state['values'][$section]);
+          $plugin = Drupal::service('plugin.manager.views.style')->createInstance($form_state['values'][$section]);
           if ($plugin) {
             $row = array('type' => $form_state['values'][$section]);
             $this->setOption($section, $row);
@@ -2288,7 +2288,7 @@ public function submitOptionsForm(&$form, &$form_state) {
       case 'exposed_form':
         $exposed_form = $this->getOption('exposed_form');
         if ($exposed_form['type'] != $form_state['values']['exposed_form']['type']) {
-          $plugin = drupal_container()->get('plugin.manager.views.exposed_form')->createInstance($form_state['values']['exposed_form']['type']);
+          $plugin = Drupal::service('plugin.manager.views.exposed_form')->createInstance($form_state['values']['exposed_form']['type']);
           if ($plugin) {
             $exposed_form = array('type' => $form_state['values']['exposed_form']['type'], 'options' => array());
             $this->setOption('exposed_form', $exposed_form);
@@ -2311,7 +2311,7 @@ public function submitOptionsForm(&$form, &$form_state) {
       case 'pager':
         $pager = $this->getOption('pager');
         if ($pager['type'] != $form_state['values']['pager']['type']) {
-          $plugin = drupal_container()->get('plugin.manager.views.pager')->createInstance($form_state['values']['pager']['type']);
+          $plugin = Drupal::service('plugin.manager.views.pager')->createInstance($form_state['values']['pager']['type']);
           if ($plugin) {
             // Because pagers have very similar options, let's allow pagers to
             // try to carry the options over.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
index 8aa9368..5ac4b66 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
@@ -61,7 +61,7 @@ public function executeHookMenu($callbacks) {
 
     $access_plugin = $this->getPlugin('access');
     if (!isset($access_plugin)) {
-      $access_plugin = drupal_container()->get("plugin.manager.views.access")->createInstance('none');
+      $access_plugin = Drupal::service('plugin.manager.views.access")->createInstance('none');
     }
 
     // Get access callback might return an array of the callback + the dynamic
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
index 5f20f4a..76ec122 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
@@ -1486,7 +1486,7 @@ function get_render_tokens($item) {
     }
 
     // Get flattened set of tokens for any array depth in $_GET parameters.
-    $tokens += $this->get_token_values_recursive(drupal_container()->get('request')->query->all());
+    $tokens += $this->get_token_values_recursive(Drupal::service('request')->query->all());
 
     // Now add replacements for our fields.
     foreach ($this->view->display_handler->getHandlers('field') as $field => $handler) {
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/join/JoinPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/join/JoinPluginBase.php
index 34e185c..bcdae83 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/join/JoinPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/join/JoinPluginBase.php
@@ -28,7 +28,7 @@
  *   'left_field' => 'field_a',
  *   'operator' => '='
  * );
- * $join = drupal_container()->get('plugin.manager.views.join')->createInstance('standard', $configuration);
+ * $join = Drupal::service('plugin.manager.views.join')->createInstance('standard', $configuration);
  *
  * Here is how you do complex joins:
  *
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php
index 4f553e3..bde6f96 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/SqlBase.php
@@ -211,7 +211,7 @@ public function validateOptionsForm(&$form, &$form_state) {
 
   public function query() {
     if ($this->items_per_page_exposed()) {
-      $query = drupal_container()->get('request')->query;
+      $query = Drupal::service('request')->query;
       $items_per_page = $query->get('items_per_page');
       if ($items_per_page > 0) {
         $this->options['items_per_page'] = $items_per_page;
@@ -221,7 +221,7 @@ public function query() {
       }
     }
     if ($this->offset_exposed()) {
-      $query = drupal_container()->get('request')->query;
+      $query = Drupal::service('request')->query;
       $offset = $query->get('offset');
       if (isset($offset) && $offset >= 0) {
         $this->options['offset'] = $offset;
@@ -265,7 +265,7 @@ function set_current_page($number = NULL) {
 
     // Fill in missing values in the global page array, in case the global page
     // array hasn't been initialized before.
-    $page = drupal_container()->get('request')->query->get('page');
+    $page = Drupal::service('request')->query->get('page');
     $page = isset($page) ? explode(',', $page) : array();
 
     for ($i = 0; $i <= $this->options['id'] || $i < count($pager_page_array); $i++) {
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
index 8f50431..d40df46 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
@@ -1444,7 +1444,7 @@ function execute(ViewExecutable $view) {
     $count_query->addMetaData('view', $view);
 
     if (empty($this->options['disable_sql_rewrite'])) {
-      $base_table_data = drupal_container()->get('views.views_data')->get($this->view->storage->get('base_table'));
+      $base_table_data = Drupal::service('views.views_data')->get($this->view->storage->get('base_table'));
       if (isset($base_table_data['table']['base']['access query tag'])) {
         $access_tag = $base_table_data['table']['base']['access query tag'];
         $query->addTag($access_tag);
@@ -1542,7 +1542,7 @@ function execute(ViewExecutable $view) {
   function get_entity_tables() {
     // Start with the base table.
     $entity_tables = array();
-    $views_data = drupal_container()->get('views.views_data');
+    $views_data = Drupal::service('views.views_data');
     $base_table_data = $views_data->get($this->view->storage->get('base_table'));
     if (isset($base_table_data['table']['entity type'])) {
       $entity_tables[$this->view->storage->get('base_table')] = array(
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
index b69a2fa..94d5f53 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/GroupwiseMax.php
@@ -93,7 +93,7 @@ public function buildOptionsForm(&$form, &$form_state) {
     foreach ($sorts as $sort_id => $sort) {
       $sort_options[$sort_id] = "$sort[group]: $sort[title]";
     }
-    $base_table_data = drupal_container()->get('views.views_data')->get($this->definition['base']);
+    $base_table_data = Drupal::service('views.views_data')->get($this->definition['base']);
 
     $form['subquery_sort'] = array(
       '#type' => 'select',
@@ -219,7 +219,7 @@ function left_query($options) {
     $temp_view->args[] = '**CORRELATED**';
 
     // Add the base table ID field.
-    $views_data = drupal_container()->get('views.views_data')->get($this->definition['base']);
+    $views_data = Drupal::service('views.views_data')->get($this->definition['base']);
     $base_field = $views_data['table']['base']['field'];
     $temp_view->addItem('default', 'field', $this->definition['base'], $this->definition['field']);
 
@@ -341,7 +341,7 @@ function condition_namespace($string) {
    */
   public function query() {
     // Figure out what base table this relationship brings to the party.
-    $table_data = drupal_container()->get('views.views_data')->get($this->definition['base']);
+    $table_data = Drupal::service('views.views_data')->get($this->definition['base']);
     $base_field = empty($this->definition['base field']) ? $table_data['table']['base']['field'] : $this->definition['base field'];
 
     $this->ensureMyTable();
@@ -379,7 +379,7 @@ public function query() {
     else {
       $id = 'subquery';
     }
-    $join = drupal_container()->get('plugin.manager.views.join')->createInstance($id, $def);
+    $join = Drupal::service('plugin.manager.views.join')->createInstance($id, $def);
 
     // use a short alias for this:
     $alias = $def['table'] . '_' . $this->table;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php
index 9725f5c..610e7f1 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php
@@ -119,7 +119,7 @@ public function buildOptionsForm(&$form, &$form_state) {
    */
   public function query() {
     // Figure out what base table this relationship brings to the party.
-    $table_data = drupal_container()->get('views.views_data')->get($this->definition['base']);
+    $table_data = Drupal::service('views.views_data')->get($this->definition['base']);
     $base_field = empty($this->definition['base field']) ? $table_data['table']['base']['field'] : $this->definition['base field'];
 
     $this->ensureMyTable();
@@ -144,7 +144,7 @@ public function query() {
     else {
       $id = 'standard';
     }
-    $join = drupal_container()->get('plugin.manager.views.join')->createInstance($id, $def);
+    $join = Drupal::service('plugin.manager.views.join')->createInstance($id, $def);
 
     // use a short alias for this:
     $alias = $def['table'] . '_' . $this->table;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/RowPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
index 25f546e..f2f1136 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
@@ -73,7 +73,7 @@ public function buildOptionsForm(&$form, &$form_state) {
         $relationship_handler = views_get_handler($relationship['table'], $relationship['field'], 'relationship');
 
         // If this relationship is valid for this type, add it to the list.
-        $data = drupal_container()->get('views.views_data')->get($relationship['table']);
+        $data = Drupal::service('views.views_data')->get($relationship['table']);
         $base = $data[$relationship['field']]['relationship']['base'];
         if ($base == $this->base_table) {
           $relationship_handler->init($executable, $relationship);
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php
index fff7c2d..ee74094 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php
@@ -52,7 +52,7 @@ public function query() {
           'left_table' => $this->tableAlias,
           'left_field' => $this->field . $i
         );
-        $join = drupal_container()->get('plugin.manager.views.join')->createInstance('standard', $definition);
+        $join = Drupal::service('plugin.manager.views.join')->createInstance('standard', $definition);
 
         $menu_links = $this->query->add_table('menu_links', NULL, $join);
         $this->query->add_orderby($menu_links, 'weight', $this->options['order']);
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php
index 8ab0337..2b65db8 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php
@@ -80,7 +80,7 @@ protected function defineOptions() {
    * @return bool
    */
   function build_sort() {
-    $order = drupal_container()->get('request')->query->get('order');
+    $order = Drupal::service('request')->query->get('order');
     if (!isset($order) && ($this->options['default'] == -1 || empty($this->view->field[$this->options['default']]))) {
       return TRUE;
     }
@@ -98,7 +98,7 @@ function build_sort() {
    * Add our actual sort criteria
    */
   function build_sort_post() {
-    $query = drupal_container()->get('request')->query;
+    $query = Drupal::service('request')->query;
     $order = $query->get('order');
     if (!isset($order)) {
       // check for a 'default' clicksort. If there isn't one, exit gracefully.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
index 50013dc..d2d2f1d 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
@@ -508,7 +508,7 @@ public static function getSelected($form_state, $parents, $default_value, $eleme
   protected function build_form_style(array &$form, array &$form_state, $type) {
     $style_form =& $form['displays'][$type]['options']['style'];
     $style = $style_form['style_plugin']['#default_value'];
-    $style_plugin = drupal_container()->get("plugin.manager.views.style")->createInstance($style);
+    $style_plugin = Drupal::service('plugin.manager.views.style')->createInstance($style);
     if (isset($style_plugin) && $style_plugin->usesRowPlugin()) {
       $options = $this->row_style_options();
       $style_form['row_plugin'] = array(
@@ -683,7 +683,7 @@ protected function build_display_options($form, $form_state) {
   protected function alter_display_options(&$display_options, $form, $form_state) {
     foreach ($display_options as $display_type => $options) {
       // Allow style plugins to hook in and provide some settings.
-      $style_plugin = drupal_container()->get("plugin.manager.views.style")->createInstance($options['style']['type']);
+      $style_plugin = Drupal::service('plugin.manager.views.style')->createInstance($options['style']['type']);
       $style_plugin->wizard_submit($form, $form_state, $this, $display_options, $display_type);
     }
   }
@@ -752,7 +752,7 @@ protected function default_display_options() {
     // Add a least one field so the view validates and the user has a preview.
     // The base field can provide a default in its base settings; otherwise,
     // choose the first field with a field handler.
-    $data = drupal_container()->get('views.views_data')->get($this->base_table);
+    $data = Drupal::service('views.views_data')->get($this->base_table);
     if (isset($data['table']['base']['defaults']['field'])) {
       $field = $data['table']['base']['defaults']['field'];
     }
@@ -833,10 +833,10 @@ protected function default_display_filters_user(array $form, array &$form_state)
           }
         }
       }
-      $table_data = drupal_container()->get('views.views_data')->get($table);
+      $table_data = Drupal::service('views.views_data')->get($table);
       // If the 'in' operator is being used, map the values to an array.
       $handler = $table_data[$bundle_key]['filter']['id'];
-      $handler_definition = drupal_container()->get('plugin.manager.views.filter')->getDefinition($handler);
+      $handler_definition = Drupal::service('plugin.manager.views.filter')->getDefinition($handler);
       if ($handler == 'in_operator' || is_subclass_of($handler_definition['class'], 'Drupal\\views\\Plugin\\views\\filter\\InOperator')) {
         $value = drupal_map_assoc(array($form_state['values']['show']['type']));
       }
@@ -919,7 +919,7 @@ protected function default_display_sorts_user($form, $form_state) {
       // created from node, but the wizard type is another base table, make
       // sure it is not added. This usually don't happen if you have js
       // enabled.
-      $data = drupal_container()->get('views.views_data')->get($table);
+      $data = Drupal::service('views.views_data')->get($table);
       if (isset($data[$column]['sort'])) {
         $sorts[$column] = array(
           'id' => $column,
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php
index dca0da1..4393b02 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAllTest.php
@@ -54,7 +54,7 @@ public static function getInfo() {
    */
   public function testHandlers() {
     $object_types = array_keys(ViewExecutable::viewsHandlerTypes());
-    foreach (drupal_container()->get('views.views_data')->get() as $base_table => $info) {
+    foreach (Drupal::service('views.views_data')->get() as $base_table => $info) {
       if (!isset($info['table']['base'])) {
         continue;
       }
diff --git a/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php b/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
index 374de36..22e6170 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php
@@ -168,7 +168,7 @@ protected function formatViewOptions(array $views = array()) {
    * Ensure that a certain handler is a instance of a certain table/field.
    */
   function assertInstanceHandler($handler, $table, $field, $id) {
-    $table_data = drupal_container()->get('views.views_data')->get($table);
+    $table_data = Drupal::service('views.views_data')->get($table);
     $field_data = $table_data[$field][$id];
 
     $this->assertEqual($field_data['id'], $handler->getPluginId());
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/FilterTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/FilterTest.php
index 0ea9d51..91acd14 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/FilterTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/FilterTest.php
@@ -59,7 +59,7 @@ protected function viewsData() {
    */
   public function testFilterQuery() {
     // Check that we can find the test filter plugin.
-    $plugin = drupal_container()->get("plugin.manager.views.filter")->createInstance('test_filter');
+    $plugin = Drupal::service('plugin.manager.views.filter")->createInstance('test_filter');
     $this->assertTrue($plugin instanceof FilterPlugin, 'Test filter plugin found.');
 
     $view = views_get_view('test_filter');
diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/JoinTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/JoinTest.php
index df011c4..f63ad73 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/JoinTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/JoinTest.php
@@ -45,7 +45,7 @@ protected function setUp() {
     parent::setUp();
 
     // Add a join plugin manager which can be used in all of the tests.
-    $this->manager = drupal_container()->get('plugin.manager.views.join');
+    $this->manager = Drupal::service('plugin.manager.views.join');
   }
 
   /**
diff --git a/core/modules/views/lib/Drupal/views/Tests/PluginInstanceTest.php b/core/modules/views/lib/Drupal/views/Tests/PluginInstanceTest.php
index 13e84f8..a3f9acc 100644
--- a/core/modules/views/lib/Drupal/views/Tests/PluginInstanceTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/PluginInstanceTest.php
@@ -84,7 +84,7 @@ public function testPluginData() {
    * This will iterate through all plugins from _views_fetch_plugin_data().
    */
   public function testPluginInstances() {
-    $container = drupal_container();
+    $container = Drupal::getContainer();
     foreach ($this->definitions as $type => $plugins) {
       // Get a plugin manager for this type.
       $manager = $container->get("plugin.manager.views.$type");
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/DisplayTest.php b/core/modules/views/lib/Drupal/views/Tests/UI/DisplayTest.php
index d89f889..d870302 100644
--- a/core/modules/views/lib/Drupal/views/Tests/UI/DisplayTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/UI/DisplayTest.php
@@ -212,7 +212,7 @@ public function testDisableDisplay() {
    * Tests views_ui_views_plugins_display_alter is altering plugin definitions.
    */
   public function testDisplayPluginsAlter() {
-    $definitions = drupal_container()->get('plugin.manager.views.display')->getDefinitions();
+    $definitions = Drupal::service('plugin.manager.views.display')->getDefinitions();
 
     $expected = array(
       'parent path' => 'admin/structure/views/view',
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewTestData.php b/core/modules/views/lib/Drupal/views/Tests/ViewTestData.php
index 232a847..08379ee 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewTestData.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewTestData.php
@@ -39,7 +39,7 @@ public static function importTestViews($class, $modules = array()) {
       $class = get_parent_class($class);
     }
     if (!empty($views)) {
-      $target_storage = drupal_container()->get('config.storage');
+      $target_storage = Drupal::service('config.storage');
       $config_changes = array(
         'delete' => array(),
         'create' => array(),
diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php
index 3246dde..45dec43 100644
--- a/core/modules/views/lib/Drupal/views/ViewExecutable.php
+++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php
@@ -571,7 +571,7 @@ public function getExposedInput() {
     // Fill our input either from $_GET or from something previously set on the
     // view.
     if (empty($this->exposed_input)) {
-      $this->exposed_input = drupal_container()->get('request')->query->all();
+      $this->exposed_input = Drupal::service('request')->query->all();
       // unset items that are definitely not our input:
       foreach (array('page', 'q') as $key) {
         if (isset($this->exposed_input[$key])) {
@@ -604,7 +604,7 @@ public function initDisplay() {
     }
 
     // Initialize the display cache array.
-    $this->displayHandlers = new DisplayBag($this, drupal_container()->get('plugin.manager.views.display'));
+    $this->displayHandlers = new DisplayBag($this, Drupal::service('plugin.manager.views.display'));
 
     $this->current_display = 'default';
     $this->display_handler = $this->displayHandlers->get('default');
@@ -693,7 +693,7 @@ public function initStyle() {
       $this->style_options = $style['options'];
     }
 
-    $this->style_plugin = drupal_container()->get("plugin.manager.views.style")->createInstance($this->plugin_name);
+    $this->style_plugin = Drupal::service('plugin.manager.views.style')->createInstance($this->plugin_name);
 
     if (empty($this->style_plugin)) {
       return FALSE;
@@ -944,7 +944,7 @@ public function initQuery() {
     }
 
     // Create and initialize the query object.
-    $views_data = drupal_container()->get('views.views_data')->get($this->storage->get('base_table'));
+    $views_data = Drupal::service('views.views_data')->get($this->storage->get('base_table'));
     $this->storage->set('base_field', !empty($views_data['table']['base']['field']) ? $views_data['table']['base']['field'] : '');
     if (!empty($views_data['table']['base']['database'])) {
       $this->base_database = $views_data['table']['base']['database'];
@@ -1937,7 +1937,7 @@ public function addItem($display_id, $type, $table, $field, $options = array(),
     ) + $options;
 
     // Load the plugin ID if available.
-    $data = drupal_container()->get('views.views_data')->get($table);
+    $data = Drupal::service('views.views_data')->get($table);
     if (isset($data[$field][$handler_type]['id'])) {
       $fields[$id]['plugin_id'] = $data[$field][$handler_type]['id'];
     }
diff --git a/core/modules/views/views.api.php b/core/modules/views/views.api.php
index 9a7abc5..fe08902 100644
--- a/core/modules/views/views.api.php
+++ b/core/modules/views/views.api.php
@@ -101,7 +101,7 @@
  * Describe data tables (or the equivalent) to Views.
  *
  * The data described with this hook is fetched and retrieved by
- * drupal_container()->get('views.views_data')->get().
+ * Drupal::service('views.views_data')->get().
  *
  * @return array
  *   An associative array describing the data structure. Primary key is the
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 31c47ff..ab24f2b 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -569,7 +569,7 @@ function views_add_contextual_links(&$render_element, $location, ViewExecutable
     // contextual links that are intended to be displayed in the requested
     // location.
     $plugin_id = $view->displayHandlers->get($display_id)->getPluginId();
-    $plugin = drupal_container()->get('plugin.manager.views.display')->getDefinition($plugin_id);
+    $plugin = Drupal::service('plugin.manager.views.display')->getDefinition($plugin_id);
     // If contextual_links_locations are not set, provide a sane default. (To
     // avoid displaying any contextual links at all, a display plugin can still
     // set 'contextual_links_locations' to, e.g., {""}.)
@@ -694,7 +694,7 @@ function views_invalidate_cache() {
 
   // Invalidate the block cache to update views block derivatives.
   if (module_exists('block')) {
-    drupal_container()->get('plugin.manager.block')->clearCachedDefinitions();
+    Drupal::service('plugin.manager.block')->clearCachedDefinitions();
   }
 
   // Allow modules to respond to the Views cache being cleared.
@@ -895,8 +895,8 @@ function views_library_info() {
  */
 function views_get_handler($table, $field, $type, $override = NULL) {
   // Get the plugin manager for this type.
-  $manager = drupal_container()->get("plugin.manager.views.$type");
-  $data = drupal_container()->get('views.views_data')->get($table);
+  $manager = Drupal::service('plugin.manager.views.$type');
+  $data = Drupal::service('views.views_data')->get($table);
 
   if (isset($data[$field][$type])) {
     $definition = $data[$field][$type];
@@ -950,7 +950,7 @@ function views_get_handler($table, $field, $type, $override = NULL) {
  *   A keyed array of in the form of 'base_table' => 'Description'.
  */
 function views_fetch_plugin_names($type, $key = NULL, $base = array()) {
-  $definitions = drupal_container()->get("plugin.manager.views.$type")->getDefinitions();
+  $definitions = Drupal::service('plugin.manager.views.$type')->getDefinitions();
   $plugins = array();
 
   foreach ($definitions as $id => $plugin) {
@@ -985,7 +985,7 @@ function views_fetch_plugin_names($type, $key = NULL, $base = array()) {
  *   An array of plugin definitions for all types.
  */
 function views_get_plugin_definitions() {
-  $container = drupal_container();
+  $container = Drupal::getContainer();
   $plugins = array();
   foreach (ViewExecutable::getPluginTypes() as $plugin_type) {
     $plugins[$plugin_type] = $container->get("plugin.manager.views.$plugin_type")->getDefinitions();
@@ -1020,7 +1020,7 @@ function views_get_enabled_display_extenders() {
  * @endcode
  */
 function views_get_applicable_views($type) {
-  $container = drupal_container();
+  $container = Drupal::getContainer();
 
   // Get all display plugins which provides the type.
   $display_plugins = $container->get('plugin.manager.views.display')->getDefinitions();
@@ -1055,14 +1055,14 @@ function views_get_applicable_views($type) {
  * Returns an array of all views as fully loaded $view objects.
  */
 function views_get_all_views() {
-  return drupal_container()->get('plugin.manager.entity')->getStorageController('view')->load();
+  return Drupal::service('plugin.manager.entity')->getStorageController('view')->load();
 }
 
 /**
  * Returns an array of all enabled views, as fully loaded $view objects.
  */
 function views_get_enabled_views() {
-  $query = drupal_container()->get('entity.query')->get('view')
+  $query = Drupal::service('entity.query')->get('view')
     ->condition('status', TRUE)
     ->execute();
 
@@ -1073,7 +1073,7 @@ function views_get_enabled_views() {
  * Returns an array of all disabled views, as fully loaded $view objects.
  */
 function views_get_disabled_views() {
-  $query = drupal_container()->get('entity.query')->get('view')
+  $query = Drupal::service('entity.query')->get('view')
     ->condition('status', FALSE)
     ->execute();
 
diff --git a/core/modules/views/views_ui/admin.inc b/core/modules/views/views_ui/admin.inc
index abf75b0..1d0329c 100644
--- a/core/modules/views/views_ui/admin.inc
+++ b/core/modules/views/views_ui/admin.inc
@@ -442,7 +442,7 @@ function _views_sort_types($a, $b) {
 function views_fetch_fields($base, $type, $grouping = FALSE, $sub_type = NULL) {
   static $fields = array();
   if (empty($fields)) {
-    $data = drupal_container()->get('views.views_data')->get();
+    $data = Drupal::service('views.views_data')->get();
     $start = microtime(TRUE);
     // This constructs this ginormous multi dimensional array to
     // collect the important data about fields. In the end,
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/Analyze.php b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/Analyze.php
index f80fee4..ad044f2 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/Analyze.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/Analyze.php
@@ -38,7 +38,7 @@ public function buildForm(array $form, array &$form_state) {
     $form['#title'] = t('View analysis');
     $form['#section'] = 'analyze';
 
-    $analyzer = drupal_container()->get('views.analyzer');
+    $analyzer = Drupal::service('views.analyzer');
     $messages = $analyzer->getMessages($view->get('executable'));
 
     $form['analysis'] = array(
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php
index 67ed22b..c1a2af8 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php
@@ -102,7 +102,7 @@ public function buildForm(array $form, array &$form_state) {
           }
 
           // If this relationship is valid for this type, add it to the list.
-          $data = drupal_container()->get('views.views_data')->get($relationship['table']);
+          $data = Drupal::service('views.views_data')->get($relationship['table']);
           $base = $data[$relationship['field']]['relationship']['base'];
           $base_fields = views_fetch_fields($base, $form_state['type'], $executable->display_handler->useGroupBy());
           if (isset($base_fields[$item['table'] . '.' . $item['field']])) {
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/EditDetails.php b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/EditDetails.php
index ad9a056..a48aea0 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/EditDetails.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/EditDetails.php
@@ -77,7 +77,7 @@ public function submitForm(array &$form, array &$form_state) {
         $view->set($key, $value);
       }
     }
-    $bases = drupal_container()->get('views.views_data')->fetchBaseTables();
+    $bases = Drupal::service('views.views_data')->fetchBaseTables();
     $form_state['#page_title'] = $view->getHumanName();
     if (isset($bases[$view->get('base_table')])) {
       $form_state['#page_title'] .= ' (' . $bases[$view->get('base_table')]['title'] . ')';
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormBase.php b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormBase.php
index b5ce81c..2740af3 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormBase.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormBase.php
@@ -167,7 +167,7 @@ public function getForm(ViewStorageInterface $view, $display_id, $js) {
     // If this form was for view-wide changes, there's no need to regenerate
     // the display section of the form.
     if ($display_id !== '') {
-      drupal_container()->get('plugin.manager.entity')->getFormController('view', 'edit')->rebuildCurrentTab($view, $response, $display_id);
+      Drupal::service('plugin.manager.entity')->getFormController('view', 'edit')->rebuildCurrentTab($view, $response, $display_id);
     }
 
     return $response;
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
index ca6478d..c2304e0 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
@@ -88,7 +88,7 @@ public function form(array $form, array &$form_state, EntityInterface $view) {
 
     // Create the "Show" dropdown, which allows the base table of the view to be
     // selected.
-    $wizard_plugins = drupal_container()->get("plugin.manager.views.wizard")->getDefinitions();
+    $wizard_plugins = Drupal::service('plugin.manager.views.wizard')->getDefinitions();
     $options = array();
     foreach ($wizard_plugins as $key => $wizard) {
       $options[$key] = $wizard['title'];
@@ -107,7 +107,7 @@ public function form(array $form, array &$form_state, EntityInterface $view) {
 
     // Build the rest of the form based on the currently selected wizard plugin.
     $wizard_key = $show_form['wizard_key']['#default_value'];
-    $wizard_instance = drupal_container()->get("plugin.manager.views.wizard")->createInstance($wizard_key);
+    $wizard_instance = Drupal::service('plugin.manager.views.wizard')->createInstance($wizard_key);
     $form = $wizard_instance->build_form($form, $form_state);
 
     return $form;
@@ -135,7 +135,7 @@ protected function actions(array $form, array &$form_state) {
    */
   public function validate(array $form, array &$form_state) {
     $wizard_type = $form_state['values']['show']['wizard_key'];
-    $wizard_instance = drupal_container()->get('plugin.manager.views.wizard')->createInstance($wizard_type);
+    $wizard_instance = Drupal::service('plugin.manager.views.wizard')->createInstance($wizard_type);
     $form_state['wizard'] = $wizard_instance->getDefinition();
     $form_state['wizard_instance'] = $wizard_instance;
     $errors = $form_state['wizard_instance']->validateView($form, $form_state);
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
index 3ce86e8..8f14fd7 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
@@ -249,7 +249,7 @@ public function submit(array $form, array &$form_state) {
     $view->set('display', $displays);
 
     // Direct the user to the right url, if the path of the display has changed.
-    $query = drupal_container()->get('request')->query;
+    $query = Drupal::service('request')->query;
     // @todo: Revisit this when http://drupal.org/node/1668866 is in.
     $destination = $query->get('destination');
     if (!empty($destination)) {
@@ -278,7 +278,7 @@ public function submit(array $form, array &$form_state) {
     drupal_set_message(t('The view %name has been saved.', array('%name' => $view->getHumanName())));
 
     // Remove this view from cache so we can edit it properly.
-    drupal_container()->get('user.tempstore')->get('views')->delete($view->id());
+    Drupal::service('user.tempstore')->get('views')->delete($view->id());
   }
 
   /**
@@ -292,7 +292,7 @@ public function submit(array $form, array &$form_state) {
   public function cancel(array $form, array &$form_state) {
     // Remove this view from cache so edits will be lost.
     $view = $this->getEntity($form_state);
-    drupal_container()->get('user.tempstore')->get('views')->delete($view->id());
+    Drupal::service('user.tempstore')->get('views')->delete($view->id());
     $form_state['redirect'] = 'admin/structure/views';
   }
 
@@ -731,7 +731,7 @@ public function renderDisplayTop(ViewUI $view) {
    * should not yet redirect to the destination.
    */
   public function submitDelayDestination($form, &$form_state) {
-    $query = drupal_container()->get('request')->query;
+    $query = Drupal::service('request')->query;
     // @todo: Revisit this when http://drupal.org/node/1668866 is in.
     $destination = $query->get('destination');
     if (isset($destination) && $form_state['redirect'] !== FALSE) {
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php
index 6b6821b..1f86dbd 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php
@@ -99,7 +99,7 @@ public function submitPreview($form, &$form_state) {
     // Rebuild the form with a pristine $view object.
     $view = $this->getEntity($form_state);
     // Attempt to load the view from temp store, otherwise create a new one.
-    if (!$new_view = drupal_container()->get('user.tempstore')->get('views')->get($view->id())) {
+    if (!$new_view = Drupal::service('user.tempstore')->get('views')->get($view->id())) {
       $new_view = new ViewUI($view);
     }
     $form_state['build_info']['args'][0] = $new_view;
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php
index 73d96e7..175bfb1 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php
@@ -534,7 +534,7 @@ public function renderPreview($display_id, $args = array()) {
       // be in GET. Copy stuff but remove ajax-framework specific keys.
       // If we're clicking on links in a preview, though, we could actually
       // still have some in $_GET, so we use $_REQUEST to ensure we get it all.
-      $exposed_input = drupal_container()->get('request')->request->all();
+      $exposed_input = Drupal::service('request')->request->all();
       foreach (array('view_name', 'view_display_id', 'view_args', 'view_path', 'view_dom_id', 'pager_element', 'view_base_path', 'ajax_html_ids', 'ajax_page_state', 'form_id', 'form_build_id', 'form_token') as $key) {
         if (isset($exposed_input[$key])) {
           unset($exposed_input[$key]);
diff --git a/core/modules/views/views_ui/views_ui.module b/core/modules/views/views_ui/views_ui.module
index 4c3ae95..a670833 100644
--- a/core/modules/views/views_ui/views_ui.module
+++ b/core/modules/views/views_ui/views_ui.module
@@ -253,7 +253,7 @@ function views_ui_cache_set(ViewUI $view) {
   unset($executable->default_display);
   $executable->query = NULL;
   unset($executable->displayHandlers);
-  drupal_container()->get('user.tempstore')->get('views')->set($view->id(), $view);
+  Drupal::service('user.tempstore')->get('views')->set($view->id(), $view);
 }
 
 /**
@@ -465,7 +465,7 @@ function views_ui_views_analyze(ViewExecutable $view) {
       continue;
     }
     if ($display->hasPath() && $path = $display->getOption('path')) {
-      $normal_path = drupal_container()->get('path.alias_manager.cached')->getSystemPath($path);
+      $normal_path = Drupal::service('path.alias_manager.cached')->getSystemPath($path);
       if ($path != $normal_path) {
         $ret[] = Analyzer::formatMessage(t('You have configured display %display with a path which is an path alias as well. This might lead to unwanted effects so better use an internal path.', array('%display' => $display->display['display_title'])), 'warning');
       }
diff --git a/core/scripts/dump-database-d6.sh b/core/scripts/dump-database-d6.sh
index 106568d..8e12133 100644
--- a/core/scripts/dump-database-d6.sh
+++ b/core/scripts/dump-database-d6.sh
@@ -44,7 +44,7 @@
 
 ENDOFHEADER;
 
-foreach (drupal_container()->get('module_handler')->getModuleList() as $module => $filename) {
+foreach (Drupal::service('module_handler')->getModuleList() as $module => $filename) {
   $output .= " *  - $module\n";
 }
 $output .= " */\n\n";
diff --git a/core/scripts/dump-database-d7.sh b/core/scripts/dump-database-d7.sh
index 3b8597d..044888c 100644
--- a/core/scripts/dump-database-d7.sh
+++ b/core/scripts/dump-database-d7.sh
@@ -45,7 +45,7 @@
 
 ENDOFHEADER;
 
-foreach (drupal_container()->get('module_handler')->getModuleList() as $module => $filename) {
+foreach (Drupal::service('module_handler')->getModuleList() as $module => $filename) {
   $output .= " *  - $module\n";
 }
 $output .= " */\n\n";
diff --git a/core/scripts/generate-d7-content.sh b/core/scripts/generate-d7-content.sh
index a19d329..54c751d 100644
--- a/core/scripts/generate-d7-content.sh
+++ b/core/scripts/generate-d7-content.sh
@@ -44,7 +44,7 @@
 
 // Create six users
 $query = db_insert('users')->fields(array('uid', 'name', 'pass', 'mail', 'status', 'created', 'access'));
-$password_hasher = drupal_container()->get('password');
+$password_hasher = Drupal::service('password');
 for ($i = 0; $i < 6; $i++) {
   $name = "test user $i";
   $pass = md5("test PassW0rd $i !(.)");
@@ -252,7 +252,7 @@
     'alias' => "content/poll/$i/results",
     'source' => "node/$node->nid/results",
   );
-  drupal_container()->get('path.crud')->save($path['source'], $path['alias']);
+  Drupal::service('path.crud')->save($path['source'], $path['alias']);
 
   // Add some votes
   $node = node_load($node->nid);
diff --git a/core/scripts/password-hash.sh b/core/scripts/password-hash.sh
index b91cd41..31cc253 100755
--- a/core/scripts/password-hash.sh
+++ b/core/scripts/password-hash.sh
@@ -83,7 +83,7 @@
 
 include_once DRUPAL_ROOT . '/core/includes/bootstrap.inc';
 
-$password_hasher = drupal_container()->get('password');
+$password_hasher = Drupal::service('password');
 
 foreach ($passwords as $password) {
   print("\npassword: $password \t\thash: ". $password_hasher->hash($password) ."\n");
diff --git a/core/themes/engines/twig/twig.engine b/core/themes/engines/twig/twig.engine
index 887aca1..b84ee14 100644
--- a/core/themes/engines/twig/twig.engine
+++ b/core/themes/engines/twig/twig.engine
@@ -49,7 +49,7 @@ function twig_render_template($template_file, $variables) {
   $output = array(
     'debug_prefix'    => '',
     'debug_info'      => '',
-    'rendered_markup' => drupal_container()->get('twig')->loadTemplate($template_file)->render($variables),
+    'rendered_markup' => Drupal::service('twig')->loadTemplate($template_file)->render($variables),
     'debug_suffix'    => '',
   );
   if (settings()->get('twig_debug', FALSE)) {
diff --git a/core/update.php b/core/update.php
index d24d6e0..53cc6e6 100644
--- a/core/update.php
+++ b/core/update.php
@@ -332,12 +332,12 @@ function update_access_allowed() {
   // Calls to user_access() might fail during the Drupal 6 to 7 update process,
   // so we fall back on requiring that the user be logged in as user #1.
   try {
-    $module_handler = drupal_container()->get('module_handler');
+    $module_handler = Drupal::service('module_handler');
     $module_filenames = $module_handler->getModuleList();
     $module_filenames['user'] = 'core/modules/user/user.module';
     $module_handler->setModuleList($module_filenames);
     $module_handler->reload();
-    drupal_container()->get('kernel')->updateModules($module_filenames, $module_filenames);
+    Drupal::service('kernel')->updateModules($module_filenames, $module_filenames);
     return user_access('administer software updates');
   }
   catch (\Exception $e) {
@@ -419,7 +419,7 @@ function update_check_requirements($skip_warnings = FALSE) {
 // @todo These two lines were copied from index.php which has its own todo about
 // a change required here. Revisit this when that change has been made.
 $request = Request::createFromGlobals();
-drupal_container()
+Drupal::getContainer()
   ->set('request', $request);
 
 // There can be conflicting 'op' parameters because both update and batch use
@@ -440,7 +440,7 @@ function update_check_requirements($skip_warnings = FALSE) {
   // Load module basics.
   include_once DRUPAL_ROOT . '/core/includes/module.inc';
   $module_list['system'] = 'core/modules/system/system.module';
-  $module_handler = drupal_container()->get('module_handler');
+  $module_handler = Drupal::service('module_handler');
   $module_handler->setModuleList($module_list);
   $module_handler->load('system');