LPS-39993 Use the correct types