[ros-diffs] [dgoette] 40336: collect functions in classes, and rename them