Switch to new state naming methods