diff --git a/lib/Drupal/config_translation/ConfigEntityMapper.php b/lib/Drupal/config_translation/ConfigEntityMapper.php
index c451d8c..69bf07c 100644
--- a/lib/Drupal/config_translation/ConfigEntityMapper.php
+++ b/lib/Drupal/config_translation/ConfigEntityMapper.php
@@ -20,7 +20,7 @@ class ConfigEntityMapper implements ConfigMapperInterface {
    *
    * @var string
    */
-  private $base_path = '';
+  private $basePath = '';
 
   /**
    * Title for translation editing screen.
@@ -34,28 +34,28 @@ class ConfigEntityMapper implements ConfigMapperInterface {
    *
    * @var string
    */
-  private $entity_type = '';
+  private $entityType = '';
 
   /**
    * Menu item type.
    *
    * @var int
    */
-  private $menu_item_type = MENU_LOCAL_TASK;
+  private $menuItemType = MENU_LOCAL_TASK;
 
   /**
    * Indicator whether an edit tab should be added.
    *
    * @var bool
    */
-  private $add_edit_tab = FALSE;
+  private $addEditTab = FALSE;
 
   /**
    * Router name for this group in the routing system.
    *
    * @var string
    */
-  private $route_name;
+  private $routeName;
 
   /**
    * Constructor for configuration group.
@@ -75,11 +75,11 @@ class ConfigEntityMapper implements ConfigMapperInterface {
    *   edit tab will need to be added.
    */
   function __construct($base_path, $entity_type, $title, $menu_item_type = MENU_LOCAL_TASK, $add_edit_tab = FALSE) {
-    $this->base_path = $base_path;
-    $this->entity_type = $entity_type;
+    $this->basePath = $base_path;
+    $this->entityType = $entity_type;
     $this->title = $title;
-    $this->menu_item_type = $menu_item_type;
-    $this->add_edit_tab = $add_edit_tab;
+    $this->menuItemType = $menu_item_type;
+    $this->addEditTab = $add_edit_tab;
     $this->setRouteName();
   }
 
@@ -87,21 +87,21 @@ class ConfigEntityMapper implements ConfigMapperInterface {
    * {@inheritdoc}
    */
   public function needsEditTab() {
-    return $this->add_edit_tab;
+    return $this->addEditTab;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getBasePath() {
-    return $this->base_path;
+    return $this->basePath;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getMenuItemType() {
-    return $this->menu_item_type;
+    return $this->menuItemType;
   }
 
   /**
@@ -115,23 +115,23 @@ class ConfigEntityMapper implements ConfigMapperInterface {
       return NULL;
     }
     if (is_string($arg)) {
-      $entity = entity_load($this->entity_type, $arg);
+      $entity = entity_load($this->entityType, $arg);
     }
     else {
       $entity = $arg;
     }
 
     // Replace path segment with the ID of the entity for further processing.
-    $base_path = str_replace('{' . $this->entity_type . '}', $entity->id(), $this->base_path);
+    $base_path = str_replace('{' . $this->entityType . '}', $entity->id(), $this->basePath);
 
     // Replace entity label in template title.
     $title = format_string($this->title, array('@label' => $entity->label()));
 
     // The list of config IDs belonging to this entity.
-    $entity_type_info = entity_get_info($this->entity_type);
+    $entity_type_info = entity_get_info($this->entityType);
     $names = array($entity_type_info['config_prefix'] . '.' . $entity->id());
 
-    return new ConfigGroupMapper($base_path, $title, $names, $this->menu_item_type, $this->add_edit_tab);
+    return new ConfigGroupMapper($base_path, $title, $names, $this->menuItemType, $this->addEditTab);
   }
 
   /**
@@ -140,21 +140,21 @@ class ConfigEntityMapper implements ConfigMapperInterface {
   public function setRouteName() {
     $search = array('/', '-', '{', '}');
     $replace = array('.', '_', '_', '_');
-    $this->route_name = 'config_translation.item.' . str_replace($search, $replace, $this->base_path);
+    $this->routeName = 'config_translation.item.' . str_replace($search, $replace, $this->basePath);
   }
 
   /**
    * {@inheritdoc}
    */
   public function getRouteName() {
-    return $this->route_name;
+    return $this->routeName;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getType() {
-    return $this->entity_type;
+    return $this->entityType;
   }
 
 }
diff --git a/lib/Drupal/config_translation/ConfigGroupMapper.php b/lib/Drupal/config_translation/ConfigGroupMapper.php
index e8f839e..de52de1 100644
--- a/lib/Drupal/config_translation/ConfigGroupMapper.php
+++ b/lib/Drupal/config_translation/ConfigGroupMapper.php
@@ -19,7 +19,7 @@ class ConfigGroupMapper implements ConfigMapperInterface {
    *
    * @var string
    */
-  private $base_path = '';
+  private $basePath = '';
 
   /**
    * Title for translation editing screen.
@@ -40,21 +40,21 @@ class ConfigGroupMapper implements ConfigMapperInterface {
    *
    * @var int
    */
-  private $menu_item_type = MENU_LOCAL_TASK;
+  private $menuItemType = MENU_LOCAL_TASK;
 
   /**
    * Indicator whether an edit tab should be added.
    *
    * @var bool
    */
-  private $add_edit_tab = FALSE;
+  private $addEditTab = FALSE;
 
   /**
    * Router name for this group in the routing system.
    *
    * @var string
    */
-  private $route_name;
+  private $routeName;
 
   /**
    * Constructor for configuration group.
@@ -73,11 +73,11 @@ class ConfigGroupMapper implements ConfigMapperInterface {
    *   edit tab will need to be added.
    */
   function __construct($base_path, $title, $names, $menu_item_type = MENU_LOCAL_TASK, $add_edit_tab = FALSE) {
-    $this->base_path = $base_path;
+    $this->basePath = $base_path;
     $this->title = $title;
     $this->names = $names;
-    $this->menu_item_type = $menu_item_type;
-    $this->add_edit_tab = $add_edit_tab;
+    $this->menuItemType = $menu_item_type;
+    $this->addEditTab = $add_edit_tab;
     $this->setRouteName();
   }
 
@@ -85,14 +85,14 @@ class ConfigGroupMapper implements ConfigMapperInterface {
    * {@inheritdoc}
    */
   public function needsEditTab() {
-    return $this->add_edit_tab;
+    return $this->addEditTab;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getBasePath() {
-    return $this->base_path;
+    return $this->basePath;
   }
 
   /**
@@ -119,7 +119,7 @@ class ConfigGroupMapper implements ConfigMapperInterface {
    * {@inheritdoc}
    */
   public function getMenuItemType() {
-    return $this->menu_item_type;
+    return $this->menuItemType;
   }
 
   /**
@@ -236,14 +236,14 @@ class ConfigGroupMapper implements ConfigMapperInterface {
    * {@inheritdoc}
    */
   public function setRouteName() {
-    $this->route_name = 'config_translation.item.' . str_replace(array('/', '-'), array('.', '_'), $this->base_path);
+    $this->routeName = 'config_translation.item.' . str_replace(array('/', '-'), array('.', '_'), $this->basePath);
   }
 
   /**
    * {@inheritdoc}
    */
   public function getRouteName() {
-    return $this->route_name;
+    return $this->routeName;
   }
 
   /**
diff --git a/lib/Drupal/config_translation/Form/ConfigTranslationManageForm.php b/lib/Drupal/config_translation/Form/ConfigTranslationManageForm.php
index e79ec9f..c334caa 100644
--- a/lib/Drupal/config_translation/Form/ConfigTranslationManageForm.php
+++ b/lib/Drupal/config_translation/Form/ConfigTranslationManageForm.php
@@ -37,14 +37,14 @@ class ConfigTranslationManageForm implements FormInterface {
    *
    * @var \Drupal\Core\Language\Language
    */
-  protected $source_language;
+  protected $sourceLanguage;
 
   /**
    * An array of base language configuration data keyed by configuration names.
    *
    * @var array
    */
-  protected $base_config = array();
+  protected $baseConfig = array();
 
   /**
    * String translation storage object.
@@ -75,15 +75,15 @@ class ConfigTranslationManageForm implements FormInterface {
   public function buildForm(array $form, array &$form_state, ConfigMapperInterface $group = NULL, Language $language = NULL, array $base_config = NULL) {
     $this->group = $group;
     $this->language = $language;
-    $this->source_language = $this->group->getConfigGroup()->getLanguageWithFallback();
-    $this->base_config = $base_config;
+    $this->sourceLanguage = $this->group->getConfigGroup()->getLanguageWithFallback();
+    $this->baseConfig = $base_config;
 
     foreach ($this->group->getNames() as $id => $name) {
       $form[$id] = array(
         '#type' => 'container',
         '#tree' => TRUE,
       );
-      $form[$id] += $this->buildConfigForm(config_typed()->get($name), config($name)->get(), $this->base_config[$name]);
+      $form[$id] += $this->buildConfigForm(config_typed()->get($name), config($name)->get(), $this->baseConfig[$name]);
     }
 
     $form['#attached']['css'] = array(drupal_get_path('module', 'config_translation') . '/config_translation.admin.css');
@@ -209,8 +209,8 @@ class ConfigTranslationManageForm implements FormInterface {
           '#theme' => 'config_translation_manage_form_element',
         );
         $build[$element_key]['source'] = array(
-          '#markup' => $base_config[$key] ? ('<span lang="' . $this->source_language->langcode . '">' . nl2br($base_config[$key] . '</span>')) : t('(Empty)'),
-          '#title' => t($definition['label']) . '<span class="element-invisible"> ('. $this->source_language->name . ')</span>',
+          '#markup' => $base_config[$key] ? ('<span lang="' . $this->sourceLanguage->langcode . '">' . nl2br($base_config[$key] . '</span>')) : t('(Empty)'),
+          '#title' => t($definition['label']) . '<span class="element-invisible"> ('. $this->sourceLanguage->name . ')</span>',
           '#type' => 'item',
         );
         $rows_words = ceil(str_word_count($value) / 5);
diff --git a/lib/Drupal/config_translation/Tests/ConfigTranslationListUITest.php b/lib/Drupal/config_translation/Tests/ConfigTranslationListUITest.php
index 3e6fe5a..0c5de4c 100644
--- a/lib/Drupal/config_translation/Tests/ConfigTranslationListUITest.php
+++ b/lib/Drupal/config_translation/Tests/ConfigTranslationListUITest.php
@@ -45,7 +45,7 @@ class ConfigTranslationListUITest extends WebTestBase {
    *
    * @var \Drupal\user\Plugin\Core\Entity\User
    */
-  protected $admin_user;
+  protected $adminUser;
 
   public function setUp() {
     parent::setUp();
@@ -65,8 +65,8 @@ class ConfigTranslationListUITest extends WebTestBase {
     );
 
     // Create and log in user.
-    $this->admin_user = $this->drupalCreateUser($permissions);
-    $this->drupalLogin($this->admin_user);
+    $this->adminUser = $this->drupalCreateUser($permissions);
+    $this->drupalLogin($this->adminUser);
   }
 
   /**
@@ -132,7 +132,7 @@ class ConfigTranslationListUITest extends WebTestBase {
     $this->assertNoLinkByHref($translate_link);
 
     // Login as Admin again otherwise the rest will fail.
-    $this->drupalLogin($this->admin_user);
+    $this->drupalLogin($this->adminUser);
   }
 
   /**