Fix name changes