refactoring naming to more correct one