fixing name changes