You are correct. However "Runway Heading" was removed from use a couple of years ago if memory serves. Probably due to people wrongly interpreting the differences between the two. "Straight Ahead" is all you should hear from ATC these days but many controllers still use "Runway Heading"
(I was guilty of that myself from time to time).