[cleanup] WS and namming consistency