Bring back the class names and prepend the sensor to the element, rather than appending it