Better name detection.