Renamed all features to have core in their name