renames, fixed a bug with required properties