diff --git a/src/certificate.cpp b/src/certificate.cpp
index 923c67ad0ec90e2a8850ed7af2256f23fe767cdd..cb4825cc6da357d8ed14a512d6b2fe646c0cee85 100644
--- a/src/certificate.cpp
+++ b/src/certificate.cpp
@@ -101,7 +101,7 @@ Matrix1D<Certificate::Details,QString> CertificatePrivate::m_slDetailssName = {{
    /* SIGNATURE_ALGORITHM            */ QObject::tr("Signature algorithm"           ),
    /* MD5_FINGERPRINT                */ QObject::tr("Md5 fingerprint"               ),
    /* SHA1_FINGERPRINT               */ QObject::tr("Sha1 fingerprint"              ),
-   /* PUBLIC_KEY_ID                  */ QObject::tr("Public key id"                 ),
+   /* PUBLIC_KEY_ID                  */ QObject::tr("Public key ID"                 ),
    /* ISSUER_DN                      */ QObject::tr("Issuer domain name"            ),
    /* NEXT_EXPECTED_UPDATE_DATE      */ QObject::tr("Next expected update"          ),
    /* OUTGOING_SERVER                */ QObject::tr("Outgoing server"               ),
diff --git a/src/phonedirectorymodel.cpp b/src/phonedirectorymodel.cpp
index fc25d7e37ade409fbb25d2fe24032fcb74114ae4..1f5b50addb6354e6fd542f875203229c8f6a81c4 100644
--- a/src/phonedirectorymodel.cpp
+++ b/src/phonedirectorymodel.cpp
@@ -304,7 +304,7 @@ QVariant PhoneDirectoryModel::headerData(int section, Qt::Orientation orientatio
    Q_UNUSED(orientation)
    static const QString headers[] = {tr("URI"), tr("Type"), tr("Person"), tr("Account"), tr("State"), tr("Call count"), tr("Week count"),
    tr("Trimester count"), tr("Have Called"), tr("Last used"), tr("Name_count"),tr("Total (in seconds)"), tr("Popularity_index"),
-   tr("Bookmarked"), tr("Tracked"), tr("Has certificate"), tr("Present"), tr("Presence message"), tr("Uid"), tr("Registered name") };
+   tr("Bookmarked"), tr("Tracked"), tr("Has certificate"), tr("Present"), tr("Presence message"), tr("UID"), tr("Registered name") };
    if (role == Qt::DisplayRole) return headers[section];
    return QVariant();
 }
diff --git a/src/ringdevicemodel.cpp b/src/ringdevicemodel.cpp
index 8c12b4b81d0975fa64a026edde8c94394b221ad0..f7eaa3dda90b8b1fc5ad131ad6d35574384cf73d 100644
--- a/src/ringdevicemodel.cpp
+++ b/src/ringdevicemodel.cpp
@@ -107,7 +107,7 @@ QVariant RingDeviceModel::headerData( int section, Qt::Orientation ori, int role
 
       switch (section) {
          case static_cast<int>(RingDevice::Column::Id):
-            return tr("Id");
+            return tr("ID");
          case static_cast<int>(RingDevice::Column::Name):
             return tr("Name");
         default: