Rename spec
Use dynamic detectors