Changed feature names to better mimic what they do