"So it's not a good idea to start adding some baptism keywords to product descriptions and such (but not remove any existing christening keywords)?"
No, you'll run the risk of cannibalizing your christening rankings and moreover may confuse your customers. Remember, develop for your customers NOT for the search engines.
For example, I work for a law firm and our homepage ranks for all sorts of criminal crimes (DUI, Drugs, etc.) So if I see an area where I want to improve my rank, say for "criminal defense attorney" - I'll write new content for a blog post or page around that set of KWs instead of trying to get the homepage to rank for that KW among all the others.