Refactor to new name