clarify calendar and fix naming