adapt to new feature names.