[ros-diffs] [sserapion] 44380: Re-add old name hack, fixes building some modules