Change to suffix-based.