Fix dependencies in users state
Renaming