refs #15 [Refactoring by tAsktoys meeting 63] Additional renaming fields and methods.