BS-8676: Use new Edapt package name