oversaw some occurences
Merge branch 'dev_rename_userEntity'