PLF-5980 rename addon containers as in spec