form: Changes names to better reflect behavior