rename initial and goal states variables