Added cast renaming to the client