Fix comments in forms; minor renaming