diff --git a/WordPress/src/main/java/org/wordpress/android/ui/LocaleAwareActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/LocaleAwareActivity.kt
index 1e5f793112b9..15afe4f33862 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/LocaleAwareActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/LocaleAwareActivity.kt
@@ -9,7 +9,7 @@ import androidx.appcompat.app.AppCompatActivity
  * the need for this class. Instead of extending from this class, we should extend
  * from AppCompatActivity.
  */
-abstract class AppCompatActivity : AppCompatActivity() {
+abstract class LocaleAwareActivity : AppCompatActivity() {
     /**
      * Used to update locales on API 21 to API 25.
      */
diff --git a/WordPress/src/main/java/org/wordpress/android/util/PerAppLocaleManager.kt b/WordPress/src/main/java/org/wordpress/android/util/PerAppLocaleManager.kt
index 822abcb43cf8..4eb5a11db067 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/PerAppLocaleManager.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/PerAppLocaleManager.kt
@@ -126,7 +126,7 @@ class PerAppLocaleManager @Inject constructor(
 
     /**
      * Called when the device language is changed from our in-app language picker
-     * TODO: Detect when language changed from app settings dialog
+     * TODO Detect when language changed from app settings dialog
      */
     fun onLanguageChanged(languageCode: String) {
         if (languageCode.isEmpty()) {