I would make this small wording change on the Key Generator and Change Password pages: Master Password instead of Master Key, since it's not technically a key and to be consistent with language found elsewhere, otherwise regular users will make a mess of these terms (they already do).