(refactor) Changed names