Refactor methods names