Fix invalid underscore references