fixed field names to match devise defaults
fixed spec file to match devise defaults