Release/ws: Moving all definitions to WS naming.