Renamed and made some better descriptions