Fix naming convention for normal state