LPS-33545 revert camelcase from 1c0a4d2885ea6ecc10c4911e4ce3021e2e3bafcd
LPS-31985 Refine solution provided by LPS-23365