Re #5151. Amend method names to conform to standards.
Re #5151. Clear cppcheck complaint about variable scope.
Merge branch 'feature/5151_remove_custominterfaces_dependencies' into develop