[ros-diffs] [janderwald] 40607: - Rename function to fix linking errors on x64