fixup! Replace references to deprecated strings
fixup! Replace references to deprecated strings