Refactoring fare; renaming back to original name.