diff --git a/src/core/Uuid.cpp b/src/core/Uuid.cpp
index 850e2d7b3..fd236df2f 100644
--- a/src/core/Uuid.cpp
+++ b/src/core/Uuid.cpp
@@ -19,10 +19,10 @@
 
 #include <QtCore/QHash>
 
-const int Uuid::length = 16;
+const int Uuid::LENGTH = 16;
 
 Uuid::Uuid()
-    : m_data(length, 0)
+    : m_data(LENGTH, 0)
 {
 }
 
diff --git a/src/core/Uuid.h b/src/core/Uuid.h
index 1916a0fa0..082594d79 100644
--- a/src/core/Uuid.h
+++ b/src/core/Uuid.h
@@ -32,7 +32,7 @@ public:
     bool isNull() const;
     bool operator==(const Uuid& other) const;
     bool operator!=(const Uuid& other) const;
-    static const int length;
+    static const int LENGTH;
     static Uuid fromBase64(const QString& str);
 
 private:
diff --git a/src/format/KeePass2XmlReader.cpp b/src/format/KeePass2XmlReader.cpp
index 3be5ca094..3da526854 100644
--- a/src/format/KeePass2XmlReader.cpp
+++ b/src/format/KeePass2XmlReader.cpp
@@ -696,7 +696,7 @@ int KeePass2XmlReader::readNumber()
 Uuid KeePass2XmlReader::readUuid()
 {
     QByteArray uuidBin = readBinary();
-    if (uuidBin.length() != Uuid::length) {
+    if (uuidBin.length() != Uuid::LENGTH) {
         raiseError();
         return Uuid();
     }