Renamed 'PasswordType' to 'PasswordHashMethod' in User scope. This way naming conventions get more normalized.