goo cal changes - use formatted name

merge conflicts