refactor/rename calendar to events