Rename client side classes