fixup! Replace references to deprecated strings