Final naming_attr fix (please)