LPS-45284 Adapt to new names