(ENCODE_UNSAFE_CHARACTER): Adjusted for the name change