Remove the underscores as they just cause more problems than they solve