Merge "Renaming duplicated states"