Personally I don't mind changing all my CHR's to BAPT's - I have very few and they're not that important. Here's the deal though...
A person is usually christened into the Christian faith i.e. named, soon after birth and the event is often combined with a baptism but baptism can take place at anytime thereafter, even into adulthood. I know that the two events will be distinct and important for some users.