Repository: wordpress-mobile/WordPress-Android (language: kotlin)

Issue:
Update terminology to Subscribers from Followers
Full Scope: https://github.com/Automattic/wordpress-mobile/issues/47
Design: [IqhXWz3Iir7RMb5XH5gGfZ-fi-883%3A4006](https://href.li/?https://www.figma.com/file/IqhXWz3Iir7RMb5XH5gGfZ/?node-id=883%3A4006)

Update terminology to Subscribers from Followers in all the app


Discussion hints:
Thanks for reporting! 👍 <!-- generated_by_dangermattic -->


Pull request: Update "Followers" terminology to "Subscribers"
Fixes #20690 
This PR updates `followers` and `follows` terminology in the app to `subscribers`. Text related to following tags or conversations should not be affected, as well as any other usage of `follow` that doesn't fit within the `subscribers` context.

-----

## To Test:
1. To test, check `Stats`, `Notifications`, `Reader`, and `People` since this is where most of the changes occur. 

Extra: Review strings.xml for usages of `followers`, `follows`, `follow`, and `following` to ensure all cases have been updated.

Some examples:

|                                | Before | After |
|--------------------------------|--------|-------|
| Stats -> Insights tab -> No Subscribers |  <img width="382" alt="Screenshot 2024-05-06 at 6 40 37 PM" src="https://github.com/wordpress-mobile/WordPress-Android/assets/7199140/642b3939-56b1-4fa7-b50e-23ef3ffa3dec">    | <img width="224" alt="Screenshot 2024-05-06 at 4 26 34 PM" src="https://github.com/wordpress-mobile/WordPress-Android/assets/7199140/4c8cd5ea-01a7-4711-9ba4-cc0d83dc7fff">   |
| Stats -> Insights tab -> Subscribers    |  <img width="378" alt="Screenshot 2024-05-06 at 6 42 37 PM" src="https://github.com/wordpress-mobile/WordPress-Android/assets/7199140/a14e0928-2bef-455b-8aed-111966a0e8f3">      |    <img width="218" alt="Screenshot 2024-05-06 at 6 02 12 PM" src="https://github.com/wordpress-mobile/WordPress-Android/assets/7199140/973dce1d-0ad0-4dc8-a0b6-c5e099df1ecc"> |
| Notifications -> Follows tab   |   <img width="396" alt="Screenshot 2024-05-06 at 6 44 28 PM" src="https://github.com/wordpress-mobile/WordPress-Android/assets/7199140/cddbc5f2-49d8-4e1d-81ca-7926b74d8bd9">     |    <img width="233" alt="Screenshot 2024-05-06 at 5 53 42 PM" src="https://github.com/wordpress-mobile/WordPress-Android/assets/7199140/bf76ecb9-a108-4b22-a50f-7e2ce9c30e49">  |
| My Site -> More -> People -> `+` button  |      <img width="288" alt="Screenshot 2024-05-06 at 6 31 59 PM" src="https://github.com/wordpress-mobile/WordPress-Android/assets/7199140/d60cb13e-33eb-4a2f-a066-8bcb2f13c758">  |  <img width="221" alt="Screenshot 2024-05-06 at 6 32 09 PM" src="https://github.com/wordpress-mobile/WordPress-Android/assets/7199140/6c6bd10c-445e-405c-ae92-66a42ebb1963">    |
| My Site -> More -> People -> `Team` dropdown menu  |    <img width="387" alt="Screenshot 2024-05-06 at 6 34 45 PM" src="https://github.com/wordpress-mobile/WordPress-Android/assets/7199140/4574815a-91e4-4c36-9e93-ca0929266c67">    |    <img width="319" alt="Screenshot 2024-05-06 at 6 34 35 PM" src="https://github.com/wordpress-mobile/WordPress-Android/assets/7199140/a9e5f944-dbdd-41f0-af60-1b62557abfe0">  |


<!-- Test instructions per dependency update: https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/docs/test_instructions_per_dependency_update.md -->

-----

## Regression Notes

1. Potential unintended areas of impact

    - String translations

3. What I did to test those areas of impact (or what existing automated tests I relied on)

    - Manual testing

4. What automated tests I added (or what prevented me from doing so)

    - Updated existing tests

-----

## PR Submission Checklist:

- [x] I have completed the Regression Notes.
- [x] I have considered adding accessibility improvements for my changes.
- [x] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary.

-----

## Testing Checklist (strike-out the not-applying and unnecessary ones):

- [ ] ~WordPress.com sites and self-hosted Jetpack sites.~
- [ ] ~Portrait and landscape orientations.~
- [ ] ~Light and dark modes.~
- [ ] ~Fonts: Larger, smaller and bold text.~
- [ ] ~High contrast.~
- [x] Talkback.
- [ ] ~Languages with large words or with letters/accents not frequently used in English.~
- [ ] ~Right-to-left languages. (Even if translation isn’t complete, formatting should still respect the right-to-left layout)~
- [ ] ~Large and small screen sizes. (Tablet and smaller phones)~
- [ ] ~Multi-tasking: Split screen and Pop-up view. (Android 10 or higher)~


Test command: ./gradlew :WordPress:testWordpressVanillaDebugUnitTest --tests "org.wordpress.android.ui.stats.refresh.lists.sections.insights.usecases.PublicizeUseCaseTest" --tests "org.wordpress.android.ui.stats.refresh.lists.sections.insights.usecases.FollowerTypesUseCaseTest" --tests "org.wordpress.android.ui.stats.refresh.lists.sections.insights.usecases.FollowersUseCaseTest" --tests "org.wordpress.android.ui.stats.refresh.lists.sections.insights.usecases.TotalFollowersUseCaseTest"

Fix patch:
diff --git a/WordPress/src/main/java/org/wordpress/android/models/PeopleListFilter.java b/WordPress/src/main/java/org/wordpress/android/models/PeopleListFilter.java
index 33213b8a937b..76daccbaf751 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/PeopleListFilter.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/PeopleListFilter.java
@@ -7,8 +7,8 @@
 
 public enum PeopleListFilter implements FilterCriteria {
     TEAM(R.string.people_dropdown_item_team),
-    FOLLOWERS(R.string.people_dropdown_item_followers),
-    EMAIL_FOLLOWERS(R.string.people_dropdown_item_email_followers),
+    SUBSCRIBERS(R.string.people_dropdown_item_subscribers),
+    EMAIL_SUBSCRIBERS(R.string.people_dropdown_item_email_subscribers),
     VIEWERS(R.string.people_dropdown_item_viewers);
 
     private final int mLabelResId;
diff --git a/WordPress/src/main/java/org/wordpress/android/models/RoleUtils.java b/WordPress/src/main/java/org/wordpress/android/models/RoleUtils.java
index 6df388644a8b..d0e557928bf5 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/RoleUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/RoleUtils.java
@@ -29,7 +29,7 @@ public static List<RoleModel> getInviteRoles(SiteStore siteStore, SiteModel site
         RoleModel viewerOrFollowerRole = new RoleModel();
         // the remote expects "follower" as the role parameter even if the role is "viewer"
         viewerOrFollowerRole.setName("follower");
-        int displayNameRes = siteModel.isPrivate() ? R.string.role_viewer : R.string.role_follower;
+        int displayNameRes = siteModel.isPrivate() ? R.string.role_viewer : R.string.role_subscriber;
         viewerOrFollowerRole.setDisplayName(context.getString(displayNameRes));
         inviteRoles.add(viewerOrFollowerRole);
         return inviteRoles;
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java
index 79ba8a858972..612d64f1fe8c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java
@@ -347,7 +347,7 @@ private void setActionBarTitleForNote(Note note) {
                 // set a default title if title is not set within the note
                 switch (note.getRawType()) {
                     case NOTE_FOLLOW_TYPE:
-                        title = getString(R.string.follows);
+                        title = getString(R.string.subscribers);
                         break;
                     case NOTE_COMMENT_LIKE_TYPE:
                         title = getString(R.string.comment_likes);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.kt
index f19db050beea..a7d8534034cd 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.kt
@@ -334,7 +334,7 @@ class NotificationsListFragment : Fragment(R.layout.notifications_list_fragment)
             All(R.string.notifications_tab_title_all, Filter.ALL),
             Unread(R.string.notifications_tab_title_unread_notifications, Filter.UNREAD),
             Comment(R.string.notifications_tab_title_comments, Filter.COMMENT),
-            Follow(R.string.notifications_tab_title_follows, Filter.FOLLOW),
+            Subscribers(R.string.notifications_tab_title_subscribers, Filter.FOLLOW),
             Like(R.string.notifications_tab_title_likes, Filter.LIKE);
         }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragmentPage.kt b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragmentPage.kt
index ce7c9ab04702..b237f0669151 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragmentPage.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragmentPage.kt
@@ -53,7 +53,7 @@ import org.wordpress.android.ui.notifications.NotificationEvents.OnNoteCommentLi
 import org.wordpress.android.ui.notifications.NotificationsListFragment.Companion.TabPosition
 import org.wordpress.android.ui.notifications.NotificationsListFragment.Companion.TabPosition.All
 import org.wordpress.android.ui.notifications.NotificationsListFragment.Companion.TabPosition.Comment
-import org.wordpress.android.ui.notifications.NotificationsListFragment.Companion.TabPosition.Follow
+import org.wordpress.android.ui.notifications.NotificationsListFragment.Companion.TabPosition.Subscribers
 import org.wordpress.android.ui.notifications.NotificationsListFragment.Companion.TabPosition.Like
 import org.wordpress.android.ui.notifications.NotificationsListFragment.Companion.TabPosition.Unread
 import org.wordpress.android.ui.notifications.NotificationsListViewModel.InlineActionEvent
@@ -364,8 +364,8 @@ class NotificationsListFragmentPage : ViewPagerFragment(R.layout.notifications_l
                 descriptionResId = R.string.notifications_empty_action_comments
                 buttonResId = R.string.notifications_empty_view_reader
             }
-            Follow.ordinal -> {
-                titleResId = R.string.notifications_empty_followers
+            Subscribers.ordinal -> {
+                titleResId = R.string.notifications_empty_subscribers
                 descriptionResId = R.string.notifications_empty_action_followers_likes
                 buttonResId = R.string.notifications_empty_view_reader
             }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java
index d522bff8a722..3e5e56863185 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java
@@ -533,8 +533,8 @@ String getValidationErrorString(String username, ValidationResult validationResu
                 return getString(R.string.invite_username_not_found, username);
             case ALREADY_MEMBER:
                 return getString(R.string.invite_already_a_member, username);
-            case ALREADY_FOLLOWING:
-                return getString(R.string.invite_already_following, username);
+            case ALREADY_SUBSCRIBED:
+                return getString(R.string.invite_already_subscribed, username);
             case BLOCKED_INVITES:
                 return getString(R.string.invite_user_blocked_invites, username);
             case INVALID_EMAIL:
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java
index efd9979b7d62..ea06c1b129df 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java
@@ -21,6 +21,7 @@
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
 import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.appbar.AppBarLayout.LayoutParams;
 
 import org.apache.commons.text.StringEscapeUtils;
 import org.wordpress.android.R;
@@ -180,7 +181,7 @@ public void onFilterSelected(int position, FilterCriteria criteria) {
             @Override
             public String onShowEmptyViewMessage(EmptyViewMessageType emptyViewMsgType) {
                 mActionableEmptyView.setVisibility(View.GONE);
-                mFilteredRecyclerView.setToolbarScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL);
+                mFilteredRecyclerView.setToolbarScrollFlags(LayoutParams.SCROLL_FLAG_SCROLL);
 
                 switch (emptyViewMsgType) {
                     case LOADING:
@@ -194,11 +195,11 @@ public String onShowEmptyViewMessage(EmptyViewMessageType emptyViewMsgType) {
                             case TEAM:
                                 title = getString(R.string.people_empty_list_filtered_users);
                                 break;
-                            case FOLLOWERS:
-                                title = getString(R.string.people_empty_list_filtered_followers);
+                            case SUBSCRIBERS:
+                                title = getString(R.string.people_empty_list_filtered_subscribers);
                                 break;
-                            case EMAIL_FOLLOWERS:
-                                title = getString(R.string.people_empty_list_filtered_email_followers);
+                            case EMAIL_SUBSCRIBERS:
+                                title = getString(R.string.people_empty_list_filtered_email_subscribers);
                                 break;
                             case VIEWERS:
                                 title = getString(R.string.people_empty_list_filtered_viewers);
@@ -213,10 +214,10 @@ public String onShowEmptyViewMessage(EmptyViewMessageType emptyViewMsgType) {
                         switch (mPeopleListFilter) {
                             case TEAM:
                                 return getString(R.string.error_fetch_users_list);
-                            case FOLLOWERS:
-                                return getString(R.string.error_fetch_followers_list);
-                            case EMAIL_FOLLOWERS:
-                                return getString(R.string.error_fetch_email_followers_list);
+                            case SUBSCRIBERS:
+                                return getString(R.string.error_fetch_subscribers_list);
+                            case EMAIL_SUBSCRIBERS:
+                                return getString(R.string.error_fetch_email_subscribers_list);
                             case VIEWERS:
                                 return getString(R.string.error_fetch_viewers_list);
                         }
@@ -309,10 +310,10 @@ public void refreshPeopleList(boolean isFetching) {
             case TEAM:
                 peopleList = PeopleTable.getUsers(mSite.getId());
                 break;
-            case FOLLOWERS:
+            case SUBSCRIBERS:
                 peopleList = PeopleTable.getFollowers(mSite.getId());
                 break;
-            case EMAIL_FOLLOWERS:
+            case EMAIL_SUBSCRIBERS:
                 peopleList = PeopleTable.getEmailFollowers(mSite.getId());
                 break;
             case VIEWERS:
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleManagementActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleManagementActivity.java
index 395e988ebf84..0add5ecb5c0b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleManagementActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleManagementActivity.java
@@ -321,7 +321,7 @@ public void onSuccess(List<Person> peopleList, int pageFetched, boolean isEndOfL
 
                 PeopleListFragment peopleListFragment = getListFragment();
                 if (peopleListFragment != null) {
-                    peopleListFragment.fetchingRequestFinished(PeopleListFilter.FOLLOWERS, isFreshList, true);
+                    peopleListFragment.fetchingRequestFinished(PeopleListFilter.SUBSCRIBERS, isFreshList, true);
                 }
 
                 refreshOnScreenFragmentDetails();
@@ -333,11 +333,11 @@ public void onError() {
                 PeopleListFragment peopleListFragment = getListFragment();
                 if (peopleListFragment != null) {
                     boolean isFirstPage = page == 1;
-                    peopleListFragment.fetchingRequestFinished(PeopleListFilter.FOLLOWERS, isFirstPage, false);
+                    peopleListFragment.fetchingRequestFinished(PeopleListFilter.SUBSCRIBERS, isFirstPage, false);
                 }
                 mFollowersFetchRequestInProgress = false;
                 ToastUtils.showToast(PeopleManagementActivity.this,
-                        R.string.error_fetch_followers_list,
+                        R.string.error_fetch_subscribers_list,
                         ToastUtils.Duration.SHORT);
             }
         });
@@ -364,7 +364,7 @@ public void onSuccess(List<Person> peopleList, int pageFetched, boolean isEndOfL
 
                 PeopleListFragment peopleListFragment = getListFragment();
                 if (peopleListFragment != null) {
-                    peopleListFragment.fetchingRequestFinished(PeopleListFilter.EMAIL_FOLLOWERS, isFreshList, true);
+                    peopleListFragment.fetchingRequestFinished(PeopleListFilter.EMAIL_SUBSCRIBERS, isFreshList, true);
                 }
 
                 refreshOnScreenFragmentDetails();
@@ -376,11 +376,11 @@ public void onError() {
                 PeopleListFragment peopleListFragment = getListFragment();
                 if (peopleListFragment != null) {
                     boolean isFirstPage = page == 1;
-                    peopleListFragment.fetchingRequestFinished(PeopleListFilter.EMAIL_FOLLOWERS, isFirstPage, false);
+                    peopleListFragment.fetchingRequestFinished(PeopleListFilter.EMAIL_SUBSCRIBERS, isFirstPage, false);
                 }
                 mEmailFollowersFetchRequestInProgress = false;
                 ToastUtils.showToast(PeopleManagementActivity.this,
-                        R.string.error_fetch_email_followers_list,
+                        R.string.error_fetch_email_subscribers_list,
                         ToastUtils.Duration.SHORT);
             }
         });
@@ -511,7 +511,7 @@ private void confirmRemovePerson() {
         } else if (person.getPersonType() == Person.PersonType.VIEWER) {
             builder.setMessage(R.string.viewer_remove_confirmation_message);
         } else {
-            builder.setMessage(R.string.follower_remove_confirmation_message);
+            builder.setMessage(R.string.subscriber_remove_confirmation_message);
         }
         builder.setNegativeButton(R.string.cancel, null);
         builder.setPositiveButton(R.string.remove, new DialogInterface.OnClickListener() {
@@ -564,7 +564,7 @@ public void onError() {
                         errorMessageRes = R.string.error_remove_viewer;
                         break;
                     default:
-                        errorMessageRes = R.string.error_remove_follower;
+                        errorMessageRes = R.string.error_remove_subscriber;
                         break;
                 }
                 ToastUtils.showToast(PeopleManagementActivity.this,
@@ -630,9 +630,9 @@ private Person getCurrentPerson() {
     public boolean onFetchFirstPage(PeopleListFilter filter) {
         if (filter == PeopleListFilter.TEAM && !mHasRefreshedUsers) {
             return fetchUsersList(mSite, 0);
-        } else if (filter == PeopleListFilter.FOLLOWERS && !mHasRefreshedFollowers) {
+        } else if (filter == PeopleListFilter.SUBSCRIBERS && !mHasRefreshedFollowers) {
             return fetchFollowersList(mSite, 1);
-        } else if (filter == PeopleListFilter.EMAIL_FOLLOWERS && !mHasRefreshedEmailFollowers) {
+        } else if (filter == PeopleListFilter.EMAIL_SUBSCRIBERS && !mHasRefreshedEmailFollowers) {
             return fetchEmailFollowersList(mSite, 1);
         } else if (filter == PeopleListFilter.VIEWERS && !mHasRefreshedViewers) {
             return fetchViewersList(mSite, 0);
@@ -645,10 +645,10 @@ public boolean onFetchMorePeople(PeopleListFilter filter) {
         if (filter == PeopleListFilter.TEAM && !mUsersEndOfListReached) {
             int count = PeopleTable.getUsersCountForLocalBlogId(mSite.getId());
             return fetchUsersList(mSite, count);
-        } else if (filter == PeopleListFilter.FOLLOWERS && !mFollowersEndOfListReached) {
+        } else if (filter == PeopleListFilter.SUBSCRIBERS && !mFollowersEndOfListReached) {
             int pageToFetch = mFollowersLastFetchedPage + 1;
             return fetchFollowersList(mSite, pageToFetch);
-        } else if (filter == PeopleListFilter.EMAIL_FOLLOWERS && !mEmailFollowersEndOfListReached) {
+        } else if (filter == PeopleListFilter.EMAIL_SUBSCRIBERS && !mEmailFollowersEndOfListReached) {
             int pageToFetch = mEmailFollowersLastFetchedPage + 1;
             return fetchEmailFollowersList(mSite, pageToFetch);
         } else if (filter == PeopleListFilter.VIEWERS && !mViewersEndOfListReached) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java
index 6f901c97faa1..f5855a315849 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java
@@ -207,9 +207,9 @@ void refreshPersonDetails() {
             } else {
                 mSubscribedDateContainer.setVisibility(View.VISIBLE);
                 if (mPersonType == Person.PersonType.FOLLOWER) {
-                    mSubscribedDateTitleView.setText(R.string.title_follower);
+                    mSubscribedDateTitleView.setText(R.string.title_subscriber);
                 } else if (mPersonType == Person.PersonType.EMAIL_FOLLOWER) {
-                    mSubscribedDateTitleView.setText(R.string.title_email_follower);
+                    mSubscribedDateTitleView.setText(R.string.title_email_subscriber);
                 }
                 String dateSubscribed = SimpleDateFormat.getDateInstance().format(person.getDateSubscribed());
                 String dateText = getString(R.string.follower_subscribed_since, dateSubscribed);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/utils/PeopleUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/people/utils/PeopleUtils.java
index 418d586a4077..dbcdd6a822a6 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/people/utils/PeopleUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/people/utils/PeopleUtils.java
@@ -455,7 +455,7 @@ public void onResponse(JSONObject jsonObject) {
                                     callback.onUsernameValidation(username, ValidationResult.ALREADY_MEMBER);
                                     continue;
                                 case "invalid_input_following":
-                                    callback.onUsernameValidation(username, ValidationResult.ALREADY_FOLLOWING);
+                                    callback.onUsernameValidation(username, ValidationResult.ALREADY_SUBSCRIBED);
                                     continue;
                                 case "invalid_user_blocked_invites":
                                     callback.onUsernameValidation(username, ValidationResult.BLOCKED_INVITES);
@@ -518,7 +518,7 @@ public interface ValidateUsernameCallback {
         enum ValidationResult {
             USER_NOT_FOUND,
             ALREADY_MEMBER,
-            ALREADY_FOLLOWING,
+            ALREADY_SUBSCRIBED,
             BLOCKED_INVITES,
             INVALID_EMAIL,
             USER_FOUND
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModelFactory.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModelFactory.kt
index 395f2566f7e6..8e432ec86e9b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModelFactory.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModelFactory.kt
@@ -171,7 +171,7 @@ class StatsViewAllViewModelFactory(
                 )
                 FOLLOWERS -> Pair(
                     insightsUseCases.first { it is FollowersUseCase },
-                    R.string.stats_view_followers
+                    R.string.stats_view_subscribers
                 )
                 TAGS_AND_CATEGORIES -> Pair(
                     insightsUseCases.first { it is TagsAndCategoriesUseCase },
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt
index 6bdfb0de15e4..06324418c560 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt
@@ -72,7 +72,7 @@ abstract class StatsListViewModel(
         INSIGHT_DETAIL(R.string.stats_insights_views_and_visitors),
         TOTAL_LIKES_DETAIL(R.string.stats_view_total_likes),
         TOTAL_COMMENTS_DETAIL(R.string.stats_view_total_comments),
-        TOTAL_FOLLOWERS_DETAIL(R.string.stats_view_total_followers),
+        TOTAL_FOLLOWERS_DETAIL(R.string.stats_view_total_subscribers),
         ANNUAL_STATS(R.string.stats_insights_annual_site_stats);
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementMapper.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementMapper.kt
index c6b9bd8e4007..b89d9e607c44 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementMapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementMapper.kt
@@ -88,14 +88,14 @@ class InsightsManagementMapper @Inject constructor(@Named(BG_THREAD) private val
         ALL_TIME_STATS -> R.string.stats_insights_all_time_stats
         TAGS_AND_CATEGORIES -> R.string.stats_insights_tags_and_categories
         COMMENTS -> R.string.stats_comments
-        FOLLOWERS -> R.string.stats_view_followers
+        FOLLOWERS -> R.string.stats_view_subscribers
         TODAY_STATS -> R.string.stats_insights_today
         POSTING_ACTIVITY -> R.string.stats_insights_posting_activity
         PUBLICIZE -> R.string.stats_view_publicize
         ANNUAL_SITE_STATS -> R.string.stats_insights_this_year_site_stats
         TOTAL_LIKES -> R.string.stats_view_total_likes
         TOTAL_COMMENTS -> R.string.stats_view_total_comments
-        TOTAL_FOLLOWERS -> R.string.stats_view_total_followers
+        TOTAL_FOLLOWERS -> R.string.stats_view_total_subscribers
         AUTHORS_COMMENTS -> R.string.stats_comments_authors
         POSTS_COMMENTS -> R.string.stats_comments_posts_and_pages
         FOLLOWER_TYPES, ACTION_REMINDER, ACTION_SCHEDULE, ACTION_GROW, FOLLOWER_TOTALS -> null
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowerTypesUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowerTypesUseCase.kt
index 08e2d0d87a4d..a4f2cab9dc59 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowerTypesUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowerTypesUseCase.kt
@@ -113,7 +113,7 @@ class FollowerTypesUseCase @Inject constructor(
                 )
 
                 val contentDescription = resourceProvider.getString(
-                    R.string.stats_total_followers_content_description,
+                    R.string.stats_total_subscribers_content_description,
                     it.value,
                     formattedPercentage
                 )
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowersUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowersUseCase.kt
index d698951d9f8d..bb7e89a3b7be 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowersUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowersUseCase.kt
@@ -122,7 +122,7 @@ class FollowersUseCase(
         }
     }
 
-    override fun buildLoadingItem(): List<BlockListItem> = listOf(Title(R.string.stats_view_followers))
+    override fun buildLoadingItem(): List<BlockListItem> = listOf(Title(R.string.stats_view_subscribers))
 
     override fun buildEmptyItem(): List<BlockListItem> {
         return listOf(buildTitle(), Empty())
@@ -180,9 +180,9 @@ class FollowersUseCase(
     }
 
     private fun buildTitle() = if (BuildConfig.IS_JETPACK_APP) {
-        Title(R.string.stats_view_followers)
+        Title(R.string.stats_view_subscribers)
     } else {
-        Title(R.string.stats_view_followers, menuAction = this::onMenuClick)
+        Title(R.string.stats_view_subscribers, menuAction = this::onMenuClick)
     }
 
     private fun loadMore() {
@@ -198,13 +198,13 @@ class FollowersUseCase(
             mutableItems.add(
                 Information(
                     resourceProvider.getString(
-                        R.string.stats_followers_count_message,
+                        R.string.stats_subscribers_count_message,
                         resourceProvider.getString(label),
                         model.totalCount
                     )
                 )
             )
-            val header = Header(R.string.stats_follower_label, R.string.stats_follower_since_label)
+            val header = Header(R.string.stats_subscriber_label, R.string.stats_follower_since_label)
             mutableItems.add(header)
             model.followers.toUserItems(header)
                 .let { mutableItems.addAll(it) }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCase.kt
index a7935e21b046..0f5fea3311f0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCase.kt
@@ -85,7 +85,7 @@ class PublicizeUseCase
         if (domainModel.services.isEmpty()) {
             items.add(Empty())
         } else {
-            val header = Header(R.string.stats_publicize_service_label, R.string.stats_publicize_followers_label)
+            val header = Header(R.string.stats_publicize_service_label, R.string.stats_publicize_subscribers_label)
             items.add(header)
             items.addAll(domainModel.services.let {
                 mapper.map(it, header)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TotalFollowersUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TotalFollowersUseCase.kt
index 562c70d38738..61114534ba38 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TotalFollowersUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TotalFollowersUseCase.kt
@@ -44,7 +44,7 @@ class TotalFollowersUseCase @Inject constructor(
     private val useCaseMode: UseCaseMode,
     private val statsUtils: StatsUtils
 ) : StatelessUseCase<Int>(TOTAL_FOLLOWERS, mainDispatcher, bgDispatcher) {
-    override fun buildLoadingItem(): List<BlockListItem> = listOf(TitleWithMore(R.string.stats_view_total_followers))
+    override fun buildLoadingItem(): List<BlockListItem> = listOf(TitleWithMore(R.string.stats_view_total_subscribers))
 
     override fun buildEmptyItem() = buildUiModel(0)
 
@@ -88,7 +88,7 @@ class TotalFollowersUseCase @Inject constructor(
             extraBottomMargin = true
         ))
         if (totalStatsMapper.shouldShowFollowersGuideCard(domainModel)) {
-            items.add(ListItemGuideCard(resourceProvider.getString(R.string.stats_insights_followers_guide_card)))
+            items.add(ListItemGuideCard(resourceProvider.getString(R.string.stats_insights_subscribers_guide_card)))
         }
         return items
     }
@@ -98,7 +98,7 @@ class TotalFollowersUseCase @Inject constructor(
     }
 
     private fun buildTitle() = TitleWithMore(
-        R.string.stats_view_total_followers,
+        R.string.stats_view_total_subscribers,
         navigationAction = if (useCaseMode == VIEW_ALL) null else ListItemInteraction.create(this::onViewMoreClick)
     )
 
diff --git a/WordPress/src/main/res/layout/people_list_fragment.xml b/WordPress/src/main/res/layout/people_list_fragment.xml
index 04704ad6c6b8..0447331f8b45 100644
--- a/WordPress/src/main/res/layout/people_list_fragment.xml
+++ b/WordPress/src/main/res/layout/people_list_fragment.xml
@@ -31,7 +31,7 @@
             android:layout_height="match_parent"
             android:visibility="gone"
             app:aevImage="@drawable/img_illustration_empty_results_216dp"
-            app:aevTitle="@string/people_empty_list_filtered_followers"
+            app:aevTitle="@string/people_empty_list_filtered_subscribers"
             tools:visibility="visible" />
 
         <org.wordpress.android.ui.FilteredRecyclerView
diff --git a/WordPress/src/main/res/layout/person_detail_fragment.xml b/WordPress/src/main/res/layout/person_detail_fragment.xml
index a2cfa0f93423..d82f46c0cdf6 100644
--- a/WordPress/src/main/res/layout/person_detail_fragment.xml
+++ b/WordPress/src/main/res/layout/person_detail_fragment.xml
@@ -105,7 +105,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:textAppearance="?attr/textAppearanceBody1"
-            tools:text="@string/title_follower" />
+            tools:text="@string/title_subscriber" />
 
         <org.wordpress.android.widgets.WPTextView
             android:id="@+id/subscribed_date_text"
diff --git a/WordPress/src/main/res/layout/stats_block_list_guide_card.xml b/WordPress/src/main/res/layout/stats_block_list_guide_card.xml
index 140d743855f1..1b3fea95f21b 100644
--- a/WordPress/src/main/res/layout/stats_block_list_guide_card.xml
+++ b/WordPress/src/main/res/layout/stats_block_list_guide_card.xml
@@ -23,7 +23,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:text="@string/stats_insights_followers_guide_card" />
+            tools:text="@string/stats_insights_subscribers_guide_card" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </com.google.android.material.card.MaterialCardView>
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index 4d97e6aa8935..9f4efaf9aa0b 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -993,8 +993,8 @@
     <string name="stats_manage_insights">Manage Insights</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
     <string name="stats_followers_email">Email</string>
-    <string name="stats_followers_count_message">Total %1$s Followers: %2$s</string>
-    <string name="stats_follower_label">Follower</string>
+    <string name="stats_subscribers_count_message">Total %1$s Subscribers: %2$s</string>
+    <string name="stats_subscriber_label">Subscriber</string>
     <string name="stats_follower_since_label">Since</string>
     <string name="stats_comments_authors">Authors</string>
     <string name="stats_comments_posts_and_pages">Posts and pages</string>
@@ -1007,7 +1007,7 @@
     <string name="stats_tags_and_categories_views_label">Views</string>
     <string name="stats_category_folded_name">%1$s | %2$s</string>
     <string name="stats_publicize_service_label">Service</string>
-    <string name="stats_publicize_followers_label">Followers</string>
+    <string name="stats_publicize_subscribers_label">Subscribers</string>
     <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
     <string name="stats_item_settings">Stats item settings</string>
     <string name="stats_cannot_be_started">We cannot open the statistics at the moment. Please try again later</string>
@@ -1043,7 +1043,7 @@
     <!-- Stats accessibility strings -->
     <string name="stats_loading_card">Loading selected card data</string>
     <string name="stats_overview_content_description">%1$s %2$s for period: %3$s, change from previous period - %4$s</string>
-    <string name="stats_total_followers_content_description">%1$s, %2$s%% of total followers</string>
+    <string name="stats_total_subscribers_content_description">%1$s, %2$s%% of total subscribers</string>
     <string name="stats_graph_updated">Graph updated.</string>
     <string name="stats_expand_content_description">Expand</string>
     <string name="stats_collapse_content_description">Collapse</string>
@@ -1322,10 +1322,9 @@
     <string name="stats_view_comments" translatable="false">@string/comments</string>
     <string name="stats_view_search_terms">Search Terms</string>
     <string name="stats_view_publicize">Jetpack Social Connections</string>
-    <string name="stats_view_followers">Followers</string>
+    <string name="stats_view_subscriber_totals">Subscriber Totals</string>
     <string name="stats_view_total_likes">Total Likes</string>
     <string name="stats_view_total_comments">Total Comments</string>
-    <string name="stats_view_total_followers">Total Followers</string>
     <string name="stats_view_total_subscribers">Total Subscribers</string>
     <string name="stats_view_subscribers_chart">Subscribers</string>
     <string name="stats_view_subscribers">Subscribers</string>
@@ -1420,7 +1419,7 @@
     <string name="stats_insights_like_guide_card">⭐️ Your latest post %1$s has received %2$s like.</string>
     <string name="stats_insights_likes_guide_card">⭐️ Your latest post %1$s has received %2$s likes.</string>
     <string name="stats_insights_comments_guide_card">💡Tap \'VIEW MORE\' to see your top commenters.</string>
-    <string name="stats_insights_followers_guide_card">💡Commenting on other blogs is a great way to build attention and followers for your new site.</string>
+    <string name="stats_insights_subscribers_guide_card">💡Commenting on other blogs is a great way to build attention and subscribers for your new site.</string>
 
     <!-- Stats refreshed widgets -->
     <string name="stats_widget_log_in_message">Please log in to the WordPress app to add a widget.</string>
@@ -1507,7 +1506,7 @@
     <string name="notifications_empty_all">No notifications…yet.</string>
     <string name="notifications_empty_unread">You\'re all up to date!</string>
     <string name="notifications_empty_comments">No comments yet</string>
-    <string name="notifications_empty_followers">No followers yet</string>
+    <string name="notifications_empty_subscribers">No subscribers yet</string>
     <string name="notifications_empty_likes">No likes yet</string>
     <string name="notifications_empty_action_all">Get active! Comment on posts from blogs you follow.</string>
     <string name="notifications_empty_action_unread">Reignite the conversation: write a new post</string>
@@ -1522,13 +1521,13 @@
     <string name="error_notification_open">Could not open notification</string>
     <string name="ignore">Ignore</string>
     <string name="push_auth_expired">The request has expired. Log in to WordPress.com to try again.</string>
-    <string name="follows">Follows</string>
+    <string name="subscribers">Subscribers</string>
     <string name="notifications_label_new_notifications">New notifications</string>
     <string name="notifications_label_new_notifications_subtitle">Tap to show them</string>
     <string name="notifications_tab_title_all">All</string>
     <string name="notifications_tab_title_unread_notifications">Unread</string>
     <string name="notifications_tab_title_comments">Comments</string>
-    <string name="notifications_tab_title_follows">Follows</string>
+    <string name="notifications_tab_title_subscribers">Subscribers</string>
     <string name="notifications_tab_title_likes">Likes</string>
     <string name="notifications_unread_content_description">Unread</string>
 
@@ -1605,14 +1604,14 @@
     <string name="comments_on_my_site">Comments on my site</string>
     <string name="likes_on_my_comments">Likes on my comments</string>
     <string name="likes_on_my_posts">Likes on my posts</string>
-    <string name="site_follows">Site follows</string>
+    <string name="site_subscriptions">Site subscriptions</string>
     <string name="site_achievements">Site achievements</string>
     <string name="username_mentions">Username mentions</string>
     <string-array name="notifications_blog_settings" translatable="false">
         <item>@string/comments_on_my_site</item>
         <item>@string/likes_on_my_comments</item>
         <item>@string/likes_on_my_posts</item>
-        <item>@string/site_follows</item>
+        <item>@string/site_subscriptions</item>
         <item>@string/site_achievements</item>
         <item>@string/username_mentions</item>
     </string-array>
@@ -2072,12 +2071,12 @@
     <string name="error_post_remote_site_settings">Couldn\'t save site info</string>
     <string name="error_fetch_users_list">Couldn\'t retrieve site users</string>
     <string name="error_fetch_authors_list">Couldn\'t retrieve authors</string>
-    <string name="error_fetch_followers_list">Couldn\'t retrieve site followers</string>
-    <string name="error_fetch_email_followers_list">Couldn\'t retrieve site email followers</string>
+    <string name="error_fetch_subscribers_list">Couldn\'t retrieve site subscribers</string>
+    <string name="error_fetch_email_subscribers_list">Couldn\'t retrieve site email subscribers</string>
     <string name="error_fetch_viewers_list">Couldn\'t retrieve site viewers</string>
     <string name="error_update_role">Couldn\'t update user role</string>
     <string name="error_remove_user">Couldn\'t remove user</string>
-    <string name="error_remove_follower">Couldn\'t remove follower</string>
+    <string name="error_remove_subscriber">Couldn\'t remove subscriber</string>
     <string name="error_remove_viewer">Couldn\'t remove viewer</string>
     <string name="error_notif_q_action_like">Could not like comment. Please try again later.</string>
     <string name="error_notif_q_action_approve">Could not approve comment. Please try again later.</string>
@@ -2647,7 +2646,7 @@
     <string name="follower_subscribed_since">Since %1$s</string>
     <string name="person_remove_confirmation_title">Remove %1$s</string>
     <string name="user_remove_confirmation_message">If you remove %1$s, that user will no longer be able to access this site, but any content that was created by %1$s will remain on the site.\n\nWould you still like to remove this user?</string>
-    <string name="follower_remove_confirmation_message">If removed, this follower will stop receiving notifications about this site, unless they re-follow.\n\nWould you still like to remove this follower?</string>
+    <string name="subscriber_remove_confirmation_message">If removed, this subscriber will stop receiving notifications about this site, unless they re-subscribe.\n\nWould you still like to remove this subscriber?</string>
     <string name="viewer_remove_confirmation_message">If you remove this viewer, he or she will not be able to visit this site.\n\nWould you still like to remove this viewer?</string>
     <string name="person_removed">Successfully removed %1$s</string>
     <string name="invite_people">Invite People</string>
@@ -2656,7 +2655,7 @@
     <string name="button_invite" translatable="false">@string/invite</string>
     <string name="invite_username_not_found">%s: User not found</string>
     <string name="invite_already_a_member">%s: Already a member</string>
-    <string name="invite_already_following">%s: Already following</string>
+    <string name="invite_already_subscribed">%s: Already subscribed</string>
     <string name="invite_user_blocked_invites">%s: User blocked invites</string>
     <string name="invite_invalid_email">%s: Invalid email</string>
     <string name="invite_message_title">Custom message</string>
@@ -2673,18 +2672,18 @@
     <string name="people_optional_custom_message_helper_text">Optional: enter a custom message to be sent with your invitation.</string>
 
     <string name="people_dropdown_item_team">Team</string>
-    <string name="people_dropdown_item_followers">Followers</string>
-    <string name="people_dropdown_item_email_followers">Email Followers</string>
+    <string name="people_dropdown_item_subscribers">Subscribers</string>
+    <string name="people_dropdown_item_email_subscribers">Email Subscribers</string>
     <string name="people_dropdown_item_viewers">Viewers</string>
     <string name="people_empty_list_filtered_users">No users yet</string>
-    <string name="people_empty_list_filtered_followers">No followers yet</string>
-    <string name="people_empty_list_filtered_email_followers">No email followers yet</string>
+    <string name="people_empty_list_filtered_subscribers">No subscribers yet</string>
+    <string name="people_empty_list_filtered_email_subscribers">No email subscribers yet</string>
     <string name="people_empty_list_filtered_viewers">No viewers yet</string>
     <string name="people_fetching">Fetching users…</string>
-    <string name="title_follower">Follower</string>
-    <string name="title_email_follower">Email Follower</string>
+    <string name="title_subscriber">Subscriber</string>
+    <string name="title_email_subscriber">Email Subscriber</string>
 
-    <string name="role_follower">Follower</string>
+    <string name="role_subscriber">Subscriber</string>
     <string name="role_viewer">Viewer</string>
 
     <string name="invite_links_section_title">Invite Link</string>


Test patch:
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowerTypesUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowerTypesUseCaseTest.kt
index 65a733f3f16d..8da714b91b26 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowerTypesUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowerTypesUseCaseTest.kt
@@ -74,7 +74,7 @@ class FollowerTypesUseCaseTest : BaseUnitTest() {
         whenever(statsUtils.toFormattedString(any<Int>(), any())).then { (it.arguments[0] as Int).toString() }
         whenever(
             resourceProvider.getString(
-                eq(R.string.stats_total_followers_content_description),
+                eq(R.string.stats_total_subscribers_content_description),
                 any<Int>(),
                 any<String>()
             )
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowersUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowersUseCaseTest.kt
index 186af514fcd2..20f49a139c88 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowersUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowersUseCaseTest.kt
@@ -101,7 +101,7 @@ class FollowersUseCaseTest : BaseUnitTest() {
         useCase = useCaseFactory.build(BLOCK)
         whenever(statsSinceLabelFormatter.getSinceLabelLowerCase(dateSubscribed)).thenReturn(sinceLabel)
         whenever(resourceProvider.getString(any())).thenReturn(wordPressLabel)
-        whenever(resourceProvider.getString(eq(R.string.stats_followers_count_message), any(), any())).thenReturn(
+        whenever(resourceProvider.getString(eq(R.string.stats_subscribers_count_message), any(), any())).thenReturn(
             message
         )
         whenever(statsSiteProvider.siteModel).thenReturn(site)
@@ -333,7 +333,7 @@ class FollowersUseCaseTest : BaseUnitTest() {
 
     private fun assertTitle(item: BlockListItem) {
         assertThat(item.type).isEqualTo(TITLE)
-        assertThat((item as Title).textResource).isEqualTo(R.string.stats_view_followers)
+        assertThat((item as Title).textResource).isEqualTo(R.string.stats_view_subscribers)
     }
 
     private fun List<BlockListItem>.assertViewAllFollowersFirstLoad(position: Int): LoadingItem {
@@ -345,7 +345,7 @@ class FollowersUseCaseTest : BaseUnitTest() {
         assertThat(this[1]).isEqualTo(Information("Total followers count is 50"))
         assertThat(this[2]).isEqualTo(
             Header(
-                R.string.stats_follower_label,
+                R.string.stats_subscriber_label,
                 R.string.stats_follower_since_label
             )
         )
@@ -380,7 +380,7 @@ class FollowersUseCaseTest : BaseUnitTest() {
         assertThat(this[2]).isEqualTo(Information("Total followers count is 50"))
         assertThat(this[3]).isEqualTo(
             Header(
-                R.string.stats_follower_label,
+                R.string.stats_subscriber_label,
                 R.string.stats_follower_since_label
             )
         )
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCaseTest.kt
index 9d232f58def8..b1d1871b1c36 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCaseTest.kt
@@ -102,7 +102,7 @@ class PublicizeUseCaseTest : BaseUnitTest() {
             assertTitle(this[0])
             val header = this[1] as Header
             assertThat(header.startLabel).isEqualTo(R.string.stats_publicize_service_label)
-            assertThat(header.endLabel).isEqualTo(R.string.stats_publicize_followers_label)
+            assertThat(header.endLabel).isEqualTo(R.string.stats_publicize_subscribers_label)
             assertThat(this[2]).isEqualTo(mockedItem)
         }
     }
@@ -138,7 +138,7 @@ class PublicizeUseCaseTest : BaseUnitTest() {
             assertTitle(this[0])
             val header = this[1] as Header
             assertThat(header.startLabel).isEqualTo(R.string.stats_publicize_service_label)
-            assertThat(header.endLabel).isEqualTo(R.string.stats_publicize_followers_label)
+            assertThat(header.endLabel).isEqualTo(R.string.stats_publicize_subscribers_label)
             assertThat(this[2]).isEqualTo(mockedItem)
             assertLink(this[3])
         }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TotalFollowersUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TotalFollowersUseCaseTest.kt
index 69a4b88caf9d..92cffa0b6b94 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TotalFollowersUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TotalFollowersUseCaseTest.kt
@@ -116,7 +116,7 @@ class TotalFollowersUseCaseTest : BaseUnitTest() {
 
     private fun assertTitle(item: BlockListItem) {
         assertThat(item.type).isEqualTo(TITLE_WITH_MORE)
-        assertThat((item as TitleWithMore).textResource).isEqualTo(R.string.stats_view_total_followers)
+        assertThat((item as TitleWithMore).textResource).isEqualTo(R.string.stats_view_total_subscribers)
     }
 
     private fun assertValue(blockListItem: BlockListItem) {
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/utils/ServiceMapperTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/utils/ServiceMapperTest.kt
index 7f3c097f46cf..3ec0046cd386 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/utils/ServiceMapperTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/utils/ServiceMapperTest.kt
@@ -46,7 +46,7 @@ class ServiceMapperTest : BaseUnitTest() {
 
         val result = serviceMapper.map(
             listOf(service),
-            Header(R.string.stats_publicize_service_label, R.string.stats_publicize_followers_label)
+            Header(R.string.stats_publicize_service_label, R.string.stats_publicize_subscribers_label)
         )
 
         assertThat(result).hasSize(1)
@@ -69,7 +69,7 @@ class ServiceMapperTest : BaseUnitTest() {
 
         val result = serviceMapper.map(
             listOf(service),
-            Header(R.string.stats_publicize_service_label, R.string.stats_publicize_followers_label)
+            Header(R.string.stats_publicize_service_label, R.string.stats_publicize_subscribers_label)
         )
 
         assertThat(result).hasSize(1)
@@ -92,7 +92,7 @@ class ServiceMapperTest : BaseUnitTest() {
 
         val result = serviceMapper.map(
             listOf(service),
-            Header(R.string.stats_publicize_service_label, R.string.stats_publicize_followers_label)
+            Header(R.string.stats_publicize_service_label, R.string.stats_publicize_subscribers_label)
         )
 
         assertThat(result).hasSize(1)
@@ -115,7 +115,7 @@ class ServiceMapperTest : BaseUnitTest() {
 
         val result = serviceMapper.map(
             listOf(service),
-            Header(R.string.stats_publicize_service_label, R.string.stats_publicize_followers_label)
+            Header(R.string.stats_publicize_service_label, R.string.stats_publicize_subscribers_label)
         )
 
         assertThat(result).hasSize(1)
@@ -138,7 +138,7 @@ class ServiceMapperTest : BaseUnitTest() {
 
         val result = serviceMapper.map(
             listOf(service),
-            Header(R.string.stats_publicize_service_label, R.string.stats_publicize_followers_label)
+            Header(R.string.stats_publicize_service_label, R.string.stats_publicize_subscribers_label)
         )
 
         assertThat(result).hasSize(1)
@@ -161,7 +161,7 @@ class ServiceMapperTest : BaseUnitTest() {
 
         val result = serviceMapper.map(
             listOf(service),
-            Header(R.string.stats_publicize_service_label, R.string.stats_publicize_followers_label)
+            Header(R.string.stats_publicize_service_label, R.string.stats_publicize_subscribers_label)
         )
 
         assertThat(result).hasSize(1)
@@ -185,7 +185,7 @@ class ServiceMapperTest : BaseUnitTest() {
 
         val result = serviceMapper.map(
             listOf(service),
-            Header(R.string.stats_publicize_service_label, R.string.stats_publicize_followers_label)
+            Header(R.string.stats_publicize_service_label, R.string.stats_publicize_subscribers_label)
         )
 
         assertThat(result).hasSize(1)
@@ -209,7 +209,7 @@ class ServiceMapperTest : BaseUnitTest() {
 
         val result = serviceMapper.map(
             listOf(service1, service2, service3),
-            Header(R.string.stats_publicize_service_label, R.string.stats_publicize_followers_label)
+            Header(R.string.stats_publicize_service_label, R.string.stats_publicize_subscribers_label)
         )
 
         assertThat(result).hasSize(3)