Improve error logging
Rename drivers with a convention to avoid conflict