[refactor] var name
[test] remove. move: in progress