Rename underscores in feature names