Re #5151. Amend method names to conform to standards.
Re #5151. Clear cppcheck complaint about variable scope.