Fix for new WS entity name format