[BZ87][BZ207] Fix wrong package provider names for 2.3.7.