form name->identifier + refactoring
finalise form_identifier change