Renaming calendar mocks to match the naming scheme and consolidating them slightly.