Fix warnings found by analyzer in ZBS
Rename calendar items' names