Renamed classes again because edit 1 looked stupid.