LPS-34594 Rename package
LPS-35466
LPS-35513