Working around nonconforming names in system definitions