67923232 Content: renaming of states, solve conflicts
Merge pull request #48 from bitzesty/67923232-content-rename-states

[#67923232] Content: renaming of states