renamings unify resource row to entry
renamings unify resource row to entry
small refactor
merge