fix mixed dashes and underscores