Update references to decor/Stateful