fixed names in forms