Fix to include cli tag name changes