replaced underscores with dashes to conform to existing codes