adapting to y_support/name_magic change