Like you said, you know you have to stop calling him baby. As for reminding him he will always be *your* baby, perhaps it is also time to recognise that he may not need to be reminded. He knows who you are, and he knows you will always be there for him. Perhaps it is now time to put more emphasis on building him up, in encouraging and nurturing this new-found desire for independent identity. Is it possible you could recognise that your DS is not you baby any longer, but rather your boy; your young man.

We all know he will always be your baby! They all will. but maybe he doesn't need to hear that now.