Refactoring of some method names to be more consistent with FactorValue terminology, no functionality changed. The purpose of these changes is to be able to discuss new functionality better next week.