LPS-46897 More consistent naming for SDK related modules