refactor for test + renamed field