Renaming to fix GMAD compatibility