diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
index cf9d64a5b..01bb6618b 100644
--- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
@@ -788,7 +788,7 @@ class Edit extends App.Controller
     '.attachmentUpload-progressBar':      'progressBar'
     '.js-percentage':                     'progressText'
     '.js-cancel':                         'cancelContainer'
-    '.text-bubble':                       'textBubble'
+    '.textBubble':                       'textBubble'
     '.editControls-item':                 'editControlItem'
     #'.editControls':                     'editControls'
     #'.recipient-picker':                 'recipientPicker'
@@ -1279,8 +1279,8 @@ class ArticleView extends App.Controller
     'click .show_toogle':           'show_toogle'
     'click [data-type=reply]':      'reply'
     'click [data-type=replyAll]':   'replyAll'
-    'click .text-bubble':           'toggle_meta_with_delay'
-    'click .text-bubble a':         'stopPropagation'
+    'click .textBubble':           'toggle_meta_with_delay'
+    'click .textBubble a':         'stopPropagation'
 
   constructor: ->
     super
diff --git a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco
index dd73a13a9..b9a593f07 100644
--- a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco
@@ -58,7 +58,7 @@
         <div class="article-content zIndex-1">
           <span class="avatar unique user-popover " data-id="2" style="background-position: -96.5079185759074px -112.28590086669901px;" data-placement="left" data-original-title="" title="">NB</span>
           <div class="flex bubble-gap internal-border">
-            <div class="text-bubble"><div class="bubble-arrow"></div>Welcome!
+            <div class="textBubble"><div class="bubble-arrow"></div>Welcome!
 
 Thank you for installing Zammad.
 
@@ -112,7 +112,7 @@ The <a href="http://Zammad.org" title="http://Zammad.org" target="_blank">Zammad
         <div class="article-content zIndex-1">
           <span class="avatar user-popover" data-id="3" style="background-image: url(api/v1/users/image/bb100af55234cf61fb6f207636f095f8)" data-placement="right" data-original-title="" title=""></span>
           <div class="flex bubble-gap internal-border">
-            <div class="text-bubble"><div class="bubble-arrow"></div>Hallp HP, du kannst dich nur einmal einloggen. Was machst du genau?</div>
+            <div class="textBubble"><div class="bubble-arrow"></div>Hallp HP, du kannst dich nur einmal einloggen. Was machst du genau?</div>
           </div>
         </div>
         <div class="article-meta-clip bottom">
@@ -150,7 +150,7 @@ The <a href="http://Zammad.org" title="http://Zammad.org" target="_blank">Zammad
         <div class="article-content zIndex-1">
           <span class="avatar unique user-popover " data-id="2" style="background-position: -96.5079185759074px -112.28590086669901px;" data-placement="left" data-original-title="" title="">NB</span>
           <div class="flex bubble-gap internal-border">
-            <div class="text-bubble"><div class="bubble-arrow"></div>Ich wollte mir die Lyrics von Maria herunterladen, aber ich schaff es einfach nicht, da raufzukommen. Schick mir bitte mein Passwort.
+            <div class="textBubble"><div class="bubble-arrow"></div>Ich wollte mir die Lyrics von Maria herunterladen, aber ich schaff es einfach nicht, da raufzukommen. Schick mir bitte mein Passwort.
 
 Grüße, Peter</div>
           </div>
diff --git a/app/assets/javascripts/app/views/layout_ref/communication_reply.jst.eco b/app/assets/javascripts/app/views/layout_ref/communication_reply.jst.eco
index d9d5e6569..96cce4e7a 100644
--- a/app/assets/javascripts/app/views/layout_ref/communication_reply.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/communication_reply.jst.eco
@@ -9,10 +9,10 @@
   <div class="ticket-edit">
     <div class="article-content zIndex-5">
       <div class="internal-border">
-        <div class="text-bubble">
+        <div class="textBubble">
           <div class="bubble-arrow"></div>
           <div class="js-textarea ticketEdit-body" contenteditable="true"><%- @content %></div>
-          <!-- .text-bubble grows with textarea (and expanding clone) -->
+          <!-- .textBubble grows with textarea (and expanding clone) -->
           <div class="attachments"></div>
             <!--
             </div>
diff --git a/app/assets/javascripts/app/views/layout_ref/richtext.jst.eco b/app/assets/javascripts/app/views/layout_ref/richtext.jst.eco
index 3043ec1ec..89820611a 100644
--- a/app/assets/javascripts/app/views/layout_ref/richtext.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/richtext.jst.eco
@@ -4,36 +4,36 @@
 
   <h2>Singleline / Textonly</h2>
 
-  <div class="text-bubble">
+  <div class="textBubble">
     <div class="bubble-arrow"></div>
     <div class="js-text-oneline text-1" contenteditable="true" data-name="body" style="min-height: 40px;"></div>
   </div>
 
-  <div class="text-bubble">
+  <div class="textBubble">
     <div class="bubble-arrow"></div>
     <div class="js-text-oneline text-2" contenteditable="true" data-name="body" style="min-height: 40px;">some test</div>
   </div>
 
   <h2>Multiline / Textonly</h2>
 
-  <div class="text-bubble">
+  <div class="textBubble">
     <div class="bubble-arrow"></div>
     <div class="js-text-multiline text-3" contenteditable="true" data-name="body" style="min-height: 40px;"></div>
   </div>
 
-  <div class="text-bubble">
+  <div class="textBubble">
     <div class="bubble-arrow"></div>
     <div class="js-text-multiline text-4" contenteditable="true" data-name="body" style="min-height: 40px;">some text <br>Multiline</div>
   </div>
 
   <h2>Multiline / Richtext</h2>
 
-  <div class="text-bubble">
+  <div class="textBubble">
     <div class="bubble-arrow"></div>
     <div class="js-text-richtext text-5" contenteditable="true" data-name="body" style="min-height: 40px;"></div>
   </div>
 
-  <div class="text-bubble">
+  <div class="textBubble">
     <div class="bubble-arrow"></div>
     <div class="js-text-richtext text-6" contenteditable="true" data-name="body" style="min-height: 40px;">some text <br>Multiline <b>bolt</b></div>
   </div>
diff --git a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
index 362003e9e..723db1630 100644
--- a/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
@@ -42,7 +42,7 @@
     <%- article.created_by.avatar("40", position) %>
     <div class="bubble-gap">
       <div class="internal-border">
-        <div class="text-bubble">
+        <div class="textBubble">
           <div class="bubble-arrow"></div>
           <%- article.html %>
           <% if !_.isEmpty( article.attachments ): %>
diff --git a/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
index 4eef2a887..30a6d0013 100644
--- a/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
@@ -49,10 +49,10 @@
         <div class="controls"><input id="" type="text" name="cc" value="<%= @article.cc %>" class="form-control"></div>
       </div>
 
-      <div class="text-bubble">
+      <div class="textBubble">
         <div class="bubble-arrow"></div>
         <div class="js-textarea ticketEdit-body" contenteditable="true" data-name="body"><%- @article.body %></div>
-        <!-- .text-bubble grows with textarea (and expanding clone) -->
+        <!-- .textBubble grows with textarea (and expanding clone) -->
         <div class="attachments"></div>
         <div class="article-attachment u-unclickable u-textTruncate">
           <div class="attachmentPlaceholder">
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index 001a19583..790f1e939 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -3040,7 +3040,7 @@ footer {
 
   /*
     clip the article-meta to not stand out on the other side
-    of the text-bubble if the text bubble is small
+    of the textBubble if the text bubble is small
   */
 
   .article-meta-clip {