LPS-52259 Refactor - rename