Some more detectors and adjusted naming.