got rid of bcrypt and some minor renames