state classes renaming