LPS-43407 Rename generic parameter to avoid conflict