Fix underscore renaming bug