rename to match current state