[BZ 1069648] First level name refactoring due to logic changes.