Fix class collision with calendar header and new bttf header

cc @jagtalon @nilnilnil @russellholt