remapped lingering _.* references