I agree that there's a semantic distinction between those two senses, but I'd point out that when you're talking about humans, there's not much practical distinction. It's not as if someone comes up to us at the age of 18 and says "OK, you're an adult, so if you don't find happiness to be moral, you may now modify your preferences at will to match your morality." That's really hard to do! So I don't think it's irrelevant.