Renamed a few features