diff --git a/src/common/KReportItemBase.h b/src/common/KReportItemBase.h
--- a/src/common/KReportItemBase.h
+++ b/src/common/KReportItemBase.h
@@ -43,7 +43,7 @@
 
 class QDomElement;
 
-class KRTextStyleData
+class KReportTextStyleData
 {
 public:
     QFont font;
@@ -103,10 +103,10 @@
     @return True if uses a sub query
     */
     virtual bool supportsSubQuery() const;
- 
+
     KPropertySet* propertySet();
     const KPropertySet* propertySet() const;
-    
+
     void setEntityName(const QString& n);
     QString entityName() const;
 
@@ -116,18 +116,18 @@
      * @brief Return the size in points
      */
     QSizeF size() const;
-    
+
     /**
      * @brief Return the position in points
      */
     QPointF position() const;
 
     void setPosition(const QPointF &pos);
     void setSize(const QSizeF &siz);
-    
+
     qreal z() const;
     void setZ(qreal z);
-    
+
     //Helper function to map between size/position units
     static QPointF scenePosition(const QPointF &pos);
     static QSizeF sceneSize(const QSizeF &size);
@@ -137,15 +137,15 @@
 protected:
     virtual void createProperties() = 0;
     bool parseReportRect(const QDomElement &elem);
-    static bool parseReportTextStyleData(const QDomElement &, KRTextStyleData*);
+    static bool parseReportTextStyleData(const QDomElement &, KReportTextStyleData*);
     static bool parseReportLineStyleData(const QDomElement &, KReportLineStyle*);
-    
+
     KProperty *nameProperty();
     QString oldName() const;
     void setOldName(const QString &old);
-    
+
     Q_SLOT virtual void propertyChanged(KPropertySet &s, KProperty &p);
-    
+
 private:
     Q_DISABLE_COPY(KReportItemBase)
     class Private;
diff --git a/src/common/KReportItemBase.cpp b/src/common/KReportItemBase.cpp
--- a/src/common/KReportItemBase.cpp
+++ b/src/common/KReportItemBase.cpp
@@ -69,7 +69,7 @@
     delete d;    
 }
 
-bool KReportItemBase::parseReportTextStyleData(const QDomElement & elemSource, KRTextStyleData *ts)
+bool KReportItemBase::parseReportTextStyleData(const QDomElement & elemSource, KReportTextStyleData *ts)
 {
     return KReportUtils::parseReportTextStyleData(elemSource, ts);
 }
diff --git a/src/common/KReportRenderObjects.h b/src/common/KReportRenderObjects.h
--- a/src/common/KReportRenderObjects.h
+++ b/src/common/KReportRenderObjects.h
@@ -272,8 +272,8 @@
     QString text() const;
     void setText(const QString &text);
 
-    KRTextStyleData textStyle() const;
-    void setTextStyle(const KRTextStyleData&);
+    KReportTextStyleData textStyle() const;
+    void setTextStyle(const KReportTextStyleData&);
 
     KReportLineStyle lineStyle() const;
     void setLineStyle(const KReportLineStyle&);
diff --git a/src/common/KReportRenderObjects.cpp b/src/common/KReportRenderObjects.cpp
--- a/src/common/KReportRenderObjects.cpp
+++ b/src/common/KReportRenderObjects.cpp
@@ -469,7 +469,7 @@
     Private();
     ~Private();
     QString text;
-    KRTextStyleData textStyle;
+    KReportTextStyleData textStyle;
     KReportLineStyle lineStyle;
     Qt::Alignment alignment;
     int flags; // Qt::AlignmentFlag and Qt::TextFlag OR'd
@@ -510,7 +510,7 @@
     d->text = s;
 }
 
-void OROTextBox::setTextStyle(const KRTextStyleData & ts)
+void OROTextBox::setTextStyle(const KReportTextStyleData & ts)
 {
     d->textStyle = ts;
 }
@@ -570,7 +570,7 @@
     return d->text;
 }
 
-KRTextStyleData OROTextBox::textStyle() const
+KReportTextStyleData OROTextBox::textStyle() const
 {
     return d->textStyle;
 }
diff --git a/src/common/KReportUtils.h b/src/common/KReportUtils.h
--- a/src/common/KReportUtils.h
+++ b/src/common/KReportUtils.h
@@ -34,7 +34,7 @@
 class KProperty;
 class KReportPosition;
 class KReportSize;
-class KRTextStyleData;
+class KReportTextStyleData;
 class KReportLineStyle;
 
 namespace KReportUtils
@@ -93,7 +93,7 @@
     KREPORT_EXPORT void buildXMLRect(QDomElement *entity, const QPointF &pos, const QSizeF &size);
 
     //! Writes attributes for text style @p ts
-    KREPORT_EXPORT void buildXMLTextStyle(QDomDocument *doc, QDomElement *entity, const KRTextStyleData &ts);
+    KREPORT_EXPORT void buildXMLTextStyle(QDomDocument *doc, QDomElement *entity, const KReportTextStyleData &ts);
 
     //! Writes attributes for line style @p ls
     KREPORT_EXPORT void buildXMLLineStyle(QDomDocument *doc, QDomElement *entity, const KReportLineStyle &ls);
@@ -111,7 +111,7 @@
     KREPORT_EXPORT void setAttribute(QDomElement *e, const QSizeF &value);
 
     //! Reads attributes from @p elemSource into text style @p ts
-    KREPORT_EXPORT bool parseReportTextStyleData(const QDomElement & elemSource, KRTextStyleData *ts);
+    KREPORT_EXPORT bool parseReportTextStyleData(const QDomElement & elemSource, KReportTextStyleData *ts);
 
     //! Reads attributes from @p elemSource into line style @p ls
     KREPORT_EXPORT bool parseReportLineStyleData(const QDomElement & elemSource, KReportLineStyle *ls);
diff --git a/src/common/KReportUtils.cpp b/src/common/KReportUtils.cpp
--- a/src/common/KReportUtils.cpp
+++ b/src/common/KReportUtils.cpp
@@ -362,7 +362,7 @@
     KReportUtils::setAttribute(entity, size );
 }
 
-void KReportUtils::buildXMLTextStyle(QDomDocument *doc, QDomElement *entity, const KRTextStyleData &ts)
+void KReportUtils::buildXMLTextStyle(QDomDocument *doc, QDomElement *entity, const KReportTextStyleData &ts)
 {
     Q_ASSERT(doc);
     Q_ASSERT(entity);
@@ -457,7 +457,7 @@
     KReportUtils::setAttribute(e, QLatin1String("svg:height"), value.height());
 }
 
-bool KReportUtils::parseReportTextStyleData(const QDomElement & elemSource, KRTextStyleData *ts)
+bool KReportUtils::parseReportTextStyleData(const QDomElement & elemSource, KReportTextStyleData *ts)
 {
     Q_ASSERT(ts);
     if (elemSource.tagName() != QLatin1String("report:text-style"))
diff --git a/src/items/field/KReportItemField.h b/src/items/field/KReportItemField.h
--- a/src/items/field/KReportItemField.h
+++ b/src/items/field/KReportItemField.h
@@ -68,7 +68,7 @@
     QStringList fieldNames(const QString &);
 
     KReportLineStyle lineStyle() const;
-    KRTextStyleData textStyle() const;
+    KReportTextStyleData textStyle() const;
 
     int textFlags() const;
 
diff --git a/src/items/field/KReportItemField.cpp b/src/items/field/KReportItemField.cpp
--- a/src/items/field/KReportItemField.cpp
+++ b/src/items/field/KReportItemField.cpp
@@ -58,7 +58,7 @@
         n = node.nodeName();
 
         if (n == QLatin1String("report:text-style")) {
-            KRTextStyleData ts;
+            KReportTextStyleData ts;
             if (parseReportTextStyleData(node.toElement(), &ts)) {
                 m_backgroundColor->setValue(ts.backgroundColor);
                 m_foregroundColor->setValue(ts.foregroundColor);
@@ -174,9 +174,9 @@
     return flags;
 }
 
-KRTextStyleData KReportItemField::textStyle() const
+KReportTextStyleData KReportItemField::textStyle() const
 {
-    KRTextStyleData d;
+    KReportTextStyleData d;
     d.backgroundColor = m_backgroundColor->value().value<QColor>();
     d.foregroundColor = m_foregroundColor->value().value<QColor>();
     d.font = m_font->value().value<QFont>();
diff --git a/src/items/label/KReportItemLabel.h b/src/items/label/KReportItemLabel.h
--- a/src/items/label/KReportItemLabel.h
+++ b/src/items/label/KReportItemLabel.h
@@ -61,7 +61,7 @@
     }
     Qt::Alignment textFlags() const;
     void setText(const QString&);
-    KRTextStyleData textStyle() const;
+    KReportTextStyleData textStyle() const;
     KReportLineStyle lineStyle() const;
 
 private:
diff --git a/src/items/label/KReportItemLabel.cpp b/src/items/label/KReportItemLabel.cpp
--- a/src/items/label/KReportItemLabel.cpp
+++ b/src/items/label/KReportItemLabel.cpp
@@ -50,7 +50,7 @@
         n = node.nodeName();
 
         if (n == QLatin1String("report:text-style")) {
-            KRTextStyleData ts;
+            KReportTextStyleData ts;
             if (parseReportTextStyleData(node.toElement(), &ts)) {
                 m_backgroundColor->setValue(ts.backgroundColor);
                 m_foregroundColor->setValue(ts.foregroundColor);
@@ -150,9 +150,9 @@
     return align;
 }
 
-KRTextStyleData KReportItemLabel::textStyle() const
+KReportTextStyleData KReportItemLabel::textStyle() const
 {
-    KRTextStyleData d;
+    KReportTextStyleData d;
     d.backgroundColor = m_backgroundColor->value().value<QColor>();
     d.foregroundColor = m_foregroundColor->value().value<QColor>();
     d.font = m_font->value().value<QFont>();
diff --git a/src/items/text/KReportItemText.h b/src/items/text/KReportItemText.h
--- a/src/items/text/KReportItemText.h
+++ b/src/items/text/KReportItemText.h
@@ -70,7 +70,7 @@
     qreal bottomPadding() const;
 
 
-    KRTextStyleData textStyle() const;
+    KReportTextStyleData textStyle() const;
     KReportLineStyle lineStyle() const;
 
 private:
diff --git a/src/items/text/KReportItemText.cpp b/src/items/text/KReportItemText.cpp
--- a/src/items/text/KReportItemText.cpp
+++ b/src/items/text/KReportItemText.cpp
@@ -55,7 +55,7 @@
         n = node.nodeName();
 
         if (n == QLatin1String("report:text-style")) {
-            KRTextStyleData ts;
+            KReportTextStyleData ts;
             if (parseReportTextStyleData(node.toElement(), &ts)) {
                 m_backgroundColor->setValue(ts.backgroundColor);
                 m_foregroundColor->setValue(ts.foregroundColor);
@@ -170,9 +170,9 @@
     }
 }
 
-KRTextStyleData KReportItemText::textStyle() const
+KReportTextStyleData KReportItemText::textStyle() const
 {
-    KRTextStyleData d;
+    KReportTextStyleData d;
     d.backgroundColor = m_backgroundColor->value().value<QColor>();
     d.foregroundColor = m_foregroundColor->value().value<QColor>();
     d.font = m_font->value().value<QFont>();
diff --git a/src/plugins/barcode/codeean.cpp b/src/plugins/barcode/codeean.cpp
--- a/src/plugins/barcode/codeean.cpp
+++ b/src/plugins/barcode/codeean.cpp
@@ -449,7 +449,7 @@
                                          val[7], val[8], val[9], val[10], val[11]);
 
     QFont font(QLatin1String("Arial"), 6);
-    KRTextStyleData ts;
+    KReportTextStyleData ts;
     ts.backgroundColor = Qt::white;
     ts.font = font;
     ts.foregroundColor = Qt::black;
@@ -812,7 +812,7 @@
     QString leftstr = QString().sprintf("%d%d%d%d%d%d",
                                         val[1], val[2], val[3], val[4], val[5], val[6]);
     QFont font(QLatin1String("Arial"), 6);
-    KRTextStyleData ts;
+    KReportTextStyleData ts;
     ts.backgroundColor = Qt::white;
     ts.font = font;
     ts.foregroundColor = Qt::black;
diff --git a/src/renderer/scripting/KReportScriptDraw.cpp b/src/renderer/scripting/KReportScriptDraw.cpp
--- a/src/renderer/scripting/KReportScriptDraw.cpp
+++ b/src/renderer/scripting/KReportScriptDraw.cpp
@@ -102,7 +102,7 @@
         QFont f(fnt, pt);
         QRectF r = QFontMetrics(f).boundingRect(txt);
 
-        KRTextStyleData ts;
+        KReportTextStyleData ts;
         ts.font = f;
         ts.backgroundColor = QColor(bc);
         ts.foregroundColor = QColor(fc);
diff --git a/src/wrtembed/KReportDesignerItemBase.h b/src/wrtembed/KReportDesignerItemBase.h
--- a/src/wrtembed/KReportDesignerItemBase.h
+++ b/src/wrtembed/KReportDesignerItemBase.h
@@ -47,7 +47,7 @@
     virtual void buildXML(QDomDocument *doc, QDomElement *parent) = 0;
 
     static void buildXMLRect(QDomDocument *doc, QDomElement *entity, KReportItemBase *i);
-    static void buildXMLTextStyle(QDomDocument *doc, QDomElement *entity, const KRTextStyleData &ts);
+    static void buildXMLTextStyle(QDomDocument *doc, QDomElement *entity, const KReportTextStyleData &ts);
     static void buildXMLLineStyle(QDomDocument *doc, QDomElement *entity, const KReportLineStyle &ls);
 
     virtual KReportDesignerItemBase* clone() = 0;
diff --git a/src/wrtembed/KReportDesignerItemBase.cpp b/src/wrtembed/KReportDesignerItemBase.cpp
--- a/src/wrtembed/KReportDesignerItemBase.cpp
+++ b/src/wrtembed/KReportDesignerItemBase.cpp
@@ -71,7 +71,7 @@
     KReportUtils::buildXMLRect(entity, i->position(), i->size());
 }
 
-void KReportDesignerItemBase::buildXMLTextStyle(QDomDocument *doc, QDomElement *entity, const KRTextStyleData &ts)
+void KReportDesignerItemBase::buildXMLTextStyle(QDomDocument *doc, QDomElement *entity, const KReportTextStyleData &ts)
 {
     KReportUtils::buildXMLTextStyle(doc, entity, ts);
 }