Refractor to new name