Naming cleanups in the build file, mostly as propsed in Bugzilla #380. Patch from...