I think we should keep the HOST and DEVICE part as it maps one-to-one from CUDA. What I did was drop the CALLABLE part for all three.