Updated the project.  Renamed methods for less chance of future conflict with foundation framework.