fix names for client side code gen