Static-mode names now patched up