Naming fixes

Hash/password name change fixes