Fix the state/pid names