support for WAA old names