diff --git a/core/modules/config/config.module b/core/modules/config/config.module
index 557b07b..0d98f23 100644
--- a/core/modules/config/config.module
+++ b/core/modules/config/config.module
@@ -60,7 +60,7 @@ function config_entity_listing_page($controller) {
  * @param Drupal\entity\EntityInterface $entity
  *   The config entity being acted upon.
  * @param string $op
- *   The action to perform, e.g., 'enable' or 'disable'.
+ *   The operation to perform, e.g., 'enable' or 'disable'.
  *
  * @return mixed
  *   Either returns the listing page as JSON, or calls drupal_goto() to
diff --git a/core/modules/config/lib/Drupal/config/EntityListControllerBase.php b/core/modules/config/lib/Drupal/config/EntityListControllerBase.php
index 9f4aed8..1bdfde4 100644
--- a/core/modules/config/lib/Drupal/config/EntityListControllerBase.php
+++ b/core/modules/config/lib/Drupal/config/EntityListControllerBase.php
@@ -91,8 +91,8 @@ abstract class EntityListControllerBase implements EntityListControllerInterface
 
     $row['id'] = $entity->id();
     $row['label'] = $entity->label();
-    $actions = $this->buildActionLinks($entity);
-    $row['actions'] = drupal_render($actions);
+    $operations = $this->buildOperationLinks($entity);
+    $row['operations'] = drupal_render($operations);
 
     return $row;
   }
@@ -102,19 +102,19 @@ abstract class EntityListControllerBase implements EntityListControllerInterface
    */
   public function getHeaderData() {
     $row = array();
-    $row['id'] = t('ID');
+    $row['id'] = t('Machine name');
     $row['label'] = t('Label');
-    $row['actions'] = t('Actions');
+    $row['operations'] = t('Operations');
     return $row;
   }
 
   /**
-   * Implements Drupal\config\EntityListControllerInterface::buildActionLinks();
+   * Implements Drupal\config\EntityListControllerInterface::buildOperationLinks();
    */
-  public function buildActionLinks(EntityInterface $entity) {
+  public function buildOperationLinks(EntityInterface $entity) {
     $links = array();
 
-    foreach ($this->defineActionLinks($entity) as $definition) {
+    foreach ($this->defineOperationLinks($entity) as $definition) {
       $attributes = array();
 
       if (!empty($definition['ajax'])) {
diff --git a/core/modules/config/lib/Drupal/config/EntityListControllerInterface.php b/core/modules/config/lib/Drupal/config/EntityListControllerInterface.php
index 6df6bcb..5725cfc 100644
--- a/core/modules/config/lib/Drupal/config/EntityListControllerInterface.php
+++ b/core/modules/config/lib/Drupal/config/EntityListControllerInterface.php
@@ -16,6 +16,9 @@ interface EntityListControllerInterface {
 
   /*
    * Returns a list of all available config entites of this type.
+   *
+   * @return array
+   *   An array of entities implementing Drupal\entity\EntityInterface.
    */
   public function getList();
 
@@ -77,19 +80,19 @@ interface EntityListControllerInterface {
   public function renderListAJAX();
 
   /**
-   * Renders a list of action links.
+   * Renders a list of operation links.
    *
    * @return array
-   *   An renderable array of action links.
+   *   An renderable array of operation links.
    */
-  public function buildActionLinks(EntityInterface $entity);
+  public function buildOperationLinks(EntityInterface $entity);
 
   /**
-   * Provides an array of information to render action links.
+   * Provides an array of information to render operation links.
    *
    * @return array
-   *   An array of action link data to use in buildActionLinks.
+   *   An array of operation link data to use in buildOperationLinks.
    */
-  public function defineActionLinks(EntityInterface $entity);
+  public function defineOperationLinks(EntityInterface $entity);
 
 }
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestListController.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestListController.php
index 5d89d56..4794145 100644
--- a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestListController.php
+++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestListController.php
@@ -27,9 +27,9 @@ class ConfigTestListController extends EntityListControllerBase {
   }
 
   /**
-   * Implements Drupal\config\EntityListControllerInterface::actionLinkMappings().
+   * Implements Drupal\config\EntityListControllerInterface::defineOperationLinks().
    */
-  public function defineActionLinks(EntityInterface $entity) {
+  public function defineOperationLinks(EntityInterface $entity) {
     $id = $entity->id();
 
     // @todo Add AJAX link to test.