Update KeePassX for new naming conventions
Merge pull request #1578 from Cottser/keepassx

Update KeePassX for new naming conventions