you may be right. I'm planning to make a cleanup when I'll remove the "Calendar" suffix (after the advent time, most probably)