Renamed client side classes