renamed and re-ordered some feature names for clarity and consistency