diff --git a/pootle/apps/pootle_language/views.py b/pootle/apps/pootle_language/views.py
index 3fb929269c6..949734da183 100644
--- a/pootle/apps/pootle_language/views.py
+++ b/pootle/apps/pootle_language/views.py
@@ -209,7 +209,7 @@ class LanguageSuggestionAdminView(PootleLanguageAdminFormView):
     form_class = LanguageSuggestionAdminForm
     success_url_pattern = "pootle-language-admin-suggestions"
     formtable_columns = (
-        _("Unit"),
+        _("String"),
         _("State"),
         _("Source"),
         _("Suggestion"),
diff --git a/pootle/apps/pootle_store/forms.py b/pootle/apps/pootle_store/forms.py
index f1c29587a88..070c84c3edf 100644
--- a/pootle/apps/pootle_store/forms.py
+++ b/pootle/apps/pootle_store/forms.py
@@ -574,7 +574,7 @@ def clean_target_f(self):
             self.add_error(
                 "target_f",
                 forms.ValidationError(
-                    _("Suggestion '%s' equals to current unit target value.",
+                    _("Suggestion '%s' equals to current string translation.",
                       target)))
         else:
             return self.cleaned_data["target_f"]
diff --git a/pootle/apps/pootle_store/unit/timeline.py b/pootle/apps/pootle_store/unit/timeline.py
index afcf11b2ae3..fdb3998302a 100644
--- a/pootle/apps/pootle_store/unit/timeline.py
+++ b/pootle/apps/pootle_store/unit/timeline.py
@@ -154,7 +154,7 @@ def __init__(self, unit_source, **kwargs):
 
     @property
     def context(self):
-        ctx = dict(description=_(u"Unit created"))
+        ctx = dict(description=_(u"String created"))
         if self.target_event is not None:
             if self.target_event.value.old_value != '':
                 ctx['value'] = self.target_event.value.old_value
diff --git a/pootle/templates/editor/units/edit.html b/pootle/templates/editor/units/edit.html
index 7793231a3fc..e62100fefc8 100644
--- a/pootle/templates/editor/units/edit.html
+++ b/pootle/templates/editor/units/edit.html
@@ -9,7 +9,7 @@
         <li><span class="content-wrapper">{{ language.name }}</span></li>
         <li><span class="content-wrapper">{{ project }}</span></li>
         <li><span class="content-wrapper">{{ unit.store.path }}</span></li>
-        <li><span class="content-wrapper">{% blocktrans with url=unit.get_translate_url id=unit.id %}<a href="{{ url }}">Unit #{{ id }}</a>{% endblocktrans %}</span></li>
+        <li><span class="content-wrapper">{% blocktrans with url=unit.get_translate_url id=unit.id %}<a href="{{ url }}">String #{{ id }}</a>{% endblocktrans %}</span></li>
       </ul>
     </div>
     <div class="translate-{% locale_align %}">
diff --git a/pootle/templates/languages/admin/language_team.html b/pootle/templates/languages/admin/language_team.html
index c78c0c0b7c0..f5636a87c9b 100644
--- a/pootle/templates/languages/admin/language_team.html
+++ b/pootle/templates/languages/admin/language_team.html
@@ -115,7 +115,7 @@ <h3>{% trans "Projects" %}</h3>
           </div>
         </div>
         <div class="config-content-panel">
-          <h3>{% trans "Unit and suggestions admin" %}</h3>
+          <h3>{% trans "String and suggestions admin" %}</h3>
           <div class="padded">
             {% url 'pootle-language-translate' language_code=language.code as translate_url %}
             <ul>
diff --git a/tests/pootle_store/timeline.py b/tests/pootle_store/timeline.py
index efbb9fd72b2..2bad09e0088 100644
--- a/tests/pootle_store/timeline.py
+++ b/tests/pootle_store/timeline.py
@@ -271,7 +271,7 @@ def test_timeline_translated_unit_creation(store0, member):
     assert len(group['events']) == 1
     assert group['events'][0]['value'] == unit.target
     assert group['events'][0]['translation']
-    assert group['events'][0]['description'] == u"Unit created"
+    assert group['events'][0]['description'] == u"String created"
     assert group['via_upload'] is False
     assert group['datetime'] == unit.creation_time
     assert group['user'].username == member.username
@@ -287,7 +287,7 @@ def test_timeline_untranslated_unit_creation(store0, member):
     assert len(group['events']) == 1
     assert 'value' not in group['events'][0]
     assert 'translation' not in group['events'][0]
-    assert group['events'][0]['description'] == u"Unit created"
+    assert group['events'][0]['description'] == u"String created"
     assert group['via_upload'] is False
     assert group['datetime'] == unit.creation_time
     assert group['user'].username == member.username
@@ -306,7 +306,7 @@ def test_timeline_untranslated_unit_creation_with_updates(store0, member):
     assert len(group['events']) == 1
     assert 'value' not in group['events'][0]
     assert 'translation' not in group['events'][0]
-    assert group['events'][0]['description'] == u"Unit created"
+    assert group['events'][0]['description'] == u"String created"
     assert group['via_upload'] is False
     assert group['datetime'] == unit.creation_time
     assert group['user'].username == member.username
@@ -327,7 +327,7 @@ def test_timeline_translated_unit_creation_with_updates(store0, member):
     assert len(group['events']) == 1
     assert group['events'][0]['value'] == "Bar"
     assert group['events'][0]['translation']
-    assert group['events'][0]['description'] == u"Unit created"
+    assert group['events'][0]['description'] == u"String created"
     assert group['via_upload'] is False
     assert group['datetime'] == unit.creation_time
     assert group['user'].username == member.username