Renamed a couple of methods to work around an app store submission problem.