Rename states to reflect parent/child relationship