Switch to _ prefixes for USESVG and NOSVG