diff --git a/src/KeyboardTranslator.cpp b/src/KeyboardTranslator.cpp
index b41c46100..998373cf3 100644
--- a/src/KeyboardTranslator.cpp
+++ b/src/KeyboardTranslator.cpp
@@ -559,18 +559,18 @@ bool KeyboardTranslator::Entry::operator==(const Entry& rhs) const
            _text == rhs._text;
 }
 
-bool KeyboardTranslator::Entry::matches(int keyCode ,
-                                        Qt::KeyboardModifiers modifiers,
+bool KeyboardTranslator::Entry::matches(int testKeyCode,
+                                        Qt::KeyboardModifiers testKeyboardModifiers,
                                         States testState) const
 {
-    if (_keyCode != keyCode)
+    if (_keyCode != testKeyCode)
         return false;
 
-    if ((modifiers & _modifierMask) != (_modifiers & _modifierMask))
+    if ((testKeyboardModifiers & _modifierMask) != (_modifiers & _modifierMask))
         return false;
 
-    // if modifiers is non-zero, the 'any modifier' state is implicit
-    if (modifiers != 0)
+    // if testKeyboardModifiers is non-zero, the 'any modifier' state is implicit
+    if (testKeyboardModifiers != 0)
         testState |= AnyModifierState;
 
     if ((testState & _stateMask) != (_state & _stateMask))
@@ -578,7 +578,8 @@ bool KeyboardTranslator::Entry::matches(int keyCode ,
 
     // special handling for the 'Any Modifier' state, which checks for the presence of
     // any or no modifiers.  In this context, the 'keypad' modifier does not count.
-    bool anyModifiersSet = modifiers != 0 && modifiers != Qt::KeypadModifier;
+    bool anyModifiersSet = (testKeyboardModifiers != 0) 
+        && (testKeyboardModifiers != Qt::KeypadModifier);
     bool wantAnyModifier = _state & KeyboardTranslator::AnyModifierState;
     if (_stateMask & KeyboardTranslator::AnyModifierState) {
         if (wantAnyModifier != anyModifiersSet)
@@ -587,9 +588,10 @@ bool KeyboardTranslator::Entry::matches(int keyCode ,
 
     return true;
 }
-QByteArray KeyboardTranslator::Entry::escapedText(bool expandWildCards, Qt::KeyboardModifiers modifiers) const
+QByteArray KeyboardTranslator::Entry::escapedText(bool expandWildCards,
+        Qt::KeyboardModifiers keyboardModifiers) const
 {
-    QByteArray result(text(expandWildCards, modifiers));
+    QByteArray result(text(expandWildCards, keyboardModifiers));
 
     for (int i = 0 ; i < result.count() ; i++) {
         char ch = result[i];
@@ -690,33 +692,34 @@ void KeyboardTranslator::Entry::insertModifier(QString& item , int modifier) con
     else if (modifier == Qt::KeypadModifier)
         item += "KeyPad";
 }
-void KeyboardTranslator::Entry::insertState(QString& item , int state) const
+void KeyboardTranslator::Entry::insertState(QString& item, int aState) const
 {
-    if (!(state & _stateMask))
+    if (!(aState & _stateMask))
         return;
 
-    if (state & _state)
+    if (aState & _state)
         item += '+' ;
     else
         item += '-' ;
 
-    if (state == KeyboardTranslator::AlternateScreenState)
+    if (aState == KeyboardTranslator::AlternateScreenState)
         item += "AppScreen";
-    else if (state == KeyboardTranslator::NewLineState)
+    else if (aState == KeyboardTranslator::NewLineState)
         item += "NewLine";
-    else if (state == KeyboardTranslator::AnsiState)
+    else if (aState == KeyboardTranslator::AnsiState)
         item += "Ansi";
-    else if (state == KeyboardTranslator::CursorKeysState)
+    else if (aState == KeyboardTranslator::CursorKeysState)
         item += "AppCursorKeys";
-    else if (state == KeyboardTranslator::AnyModifierState)
+    else if (aState == KeyboardTranslator::AnyModifierState)
         item += "AnyModifier";
-    else if (state == KeyboardTranslator::ApplicationKeypadState)
+    else if (aState == KeyboardTranslator::ApplicationKeypadState)
         item += "AppKeypad";
 }
-QString KeyboardTranslator::Entry::resultToString(bool expandWildCards, Qt::KeyboardModifiers modifiers) const
+QString KeyboardTranslator::Entry::resultToString(bool expandWildCards,
+        Qt::KeyboardModifiers keyboardModifiers) const
 {
     if (!_text.isEmpty())
-        return escapedText(expandWildCards, modifiers);
+        return escapedText(expandWildCards, keyboardModifiers);
     else if (_command == EraseCommand)
         return "Erase";
     else if (_command == ScrollPageUpCommand)
@@ -756,22 +759,22 @@ QString KeyboardTranslator::Entry::conditionToString() const
     return result;
 }
 
-KeyboardTranslator::KeyboardTranslator(const QString& name)
-    : _name(name)
+KeyboardTranslator::KeyboardTranslator(const QString& aName)
+    : _name(aName)
 {
 }
 
-void KeyboardTranslator::setDescription(const QString& description)
+void KeyboardTranslator::setDescription(const QString& aDescription)
 {
-    _description = description;
+    _description = aDescription;
 }
 QString KeyboardTranslator::description() const
 {
     return _description;
 }
-void KeyboardTranslator::setName(const QString& name)
+void KeyboardTranslator::setName(const QString& aName)
 {
-    _name = name;
+    _name = aName;
 }
 QString KeyboardTranslator::name() const
 {
diff --git a/src/KeyboardTranslator.h b/src/KeyboardTranslator.h
index 6685e0edd..95adc6ee2 100644
--- a/src/KeyboardTranslator.h
+++ b/src/KeyboardTranslator.h
@@ -138,7 +138,7 @@ public:
         /** Returns the commands associated with this entry */
         Command command() const;
         /** Sets the command associated with this entry. */
-        void setCommand(Command command);
+        void setCommand(Command aCommand);
 
         /**
          * Returns the character sequence associated with this entry, optionally replacing
@@ -153,10 +153,10 @@ public:
          * @param modifiers The keyboard modifiers being pressed.
          */
         QByteArray text(bool expandWildCards = false,
-                        Qt::KeyboardModifiers modifiers = Qt::NoModifier) const;
+                        Qt::KeyboardModifiers keyboardModifiers = Qt::NoModifier) const;
 
         /** Sets the character sequence associated with this entry */
-        void setText(const QByteArray& text);
+        void setText(const QByteArray& aText);
 
         /**
          * Returns the character sequence associated with this entry,
@@ -173,7 +173,7 @@ public:
         /** Returns the character code ( from the Qt::Key enum ) associated with this entry */
         int keyCode() const;
         /** Sets the character code associated with this entry */
-        void setKeyCode(int keyCode);
+        void setKeyCode(int aKeyCode);
 
         /**
          * Returns a bitwise-OR of the enabled keyboard modifiers associated with this entry.
@@ -207,9 +207,9 @@ public:
         States stateMask() const;
 
         /** See state() */
-        void setState(States state);
+        void setState(States aState);
         /** See stateMask() */
-        void setStateMask(States mask);
+        void setStateMask(States aStateMask);
 
         /**
          * Returns the key code and modifiers associated with this entry
@@ -511,9 +511,9 @@ inline int KeyboardTranslator::Entry::keyCode() const
 {
     return _keyCode;
 }
-inline void KeyboardTranslator::Entry::setKeyCode(int keyCode)
+inline void KeyboardTranslator::Entry::setKeyCode(int aKeyCode)
 {
-    _keyCode = keyCode;
+    _keyCode = aKeyCode;
 }
 
 inline void KeyboardTranslator::Entry::setModifiers(Qt::KeyboardModifiers modifier)
@@ -539,32 +539,33 @@ inline bool KeyboardTranslator::Entry::isNull() const
     return (*this == Entry());
 }
 
-inline void KeyboardTranslator::Entry::setCommand(Command command)
+inline void KeyboardTranslator::Entry::setCommand(Command aCommand)
 {
-    _command = command;
+    _command = aCommand;
 }
 inline KeyboardTranslator::Command KeyboardTranslator::Entry::command() const
 {
     return _command;
 }
 
-inline void KeyboardTranslator::Entry::setText(const QByteArray& text)
+inline void KeyboardTranslator::Entry::setText(const QByteArray& aText)
 {
-    _text = unescape(text);
+    _text = unescape(aText);
 }
 inline int oneOrZero(int value)
 {
     return value ? 1 : 0;
 }
-inline QByteArray KeyboardTranslator::Entry::text(bool expandWildCards, Qt::KeyboardModifiers modifiers) const
+inline QByteArray KeyboardTranslator::Entry::text(bool expandWildCards,
+        Qt::KeyboardModifiers keyboardModifiers) const
 {
     QByteArray expandedText = _text;
 
     if (expandWildCards) {
         int modifierValue = 1;
-        modifierValue += oneOrZero(modifiers & Qt::ShiftModifier);
-        modifierValue += oneOrZero(modifiers & Qt::AltModifier)     << 1;
-        modifierValue += oneOrZero(modifiers & Qt::ControlModifier) << 2;
+        modifierValue += oneOrZero(keyboardModifiers & Qt::ShiftModifier);
+        modifierValue += oneOrZero(keyboardModifiers & Qt::AltModifier)     << 1;
+        modifierValue += oneOrZero(keyboardModifiers & Qt::ControlModifier) << 2;
 
         for (int i = 0; i < _text.length(); i++) {
             if (expandedText[i] == '*')
@@ -575,18 +576,18 @@ inline QByteArray KeyboardTranslator::Entry::text(bool expandWildCards, Qt::Keyb
     return expandedText;
 }
 
-inline void KeyboardTranslator::Entry::setState(States state)
+inline void KeyboardTranslator::Entry::setState(States aState)
 {
-    _state = state;
+    _state = aState;
 }
 inline KeyboardTranslator::States KeyboardTranslator::Entry::state() const
 {
     return _state;
 }
 
-inline void KeyboardTranslator::Entry::setStateMask(States stateMask)
+inline void KeyboardTranslator::Entry::setStateMask(States aStateMask)
 {
-    _stateMask = stateMask;
+    _stateMask = aStateMask;
 }
 inline KeyboardTranslator::States KeyboardTranslator::Entry::stateMask() const
 {