BUG-1270: use QNameModule where possible