Bug 873351 - 2.c/N:
Bug 873351 - 2.d/N: rename private methods.