Switch back to string constants for criterion