Remove existing user key when replacing public key
Renaming
Merge pull request #3 from WTF-Limited/jimmychu

Some renaming