Included bcrypt into the appropriate models and cleaned up some data field names