Tidied up class names.  Fix for device detection.