Changed hyphens to underscores to match original