rewrite creation of field and remove rename of field