Changed names of form/lang things