Fix breakage due to namespaced variants