Renamed and reordered a few things