Changed from hyphen to underscore in variable names.