Clean up of builder package

Renames constants to be consistent and fixes a hard-coded filename in
the out module.