For Leviton Z-Wave dimmer, I'm using this:
For the basic switches I am using the "Generic ZWave Switch" driver.