Renamed all cases to match sections in written work