Update for new encoding with _'s.