Form proper name fix