Fixed lots of minor issues found by Edward Moy: incorrect version
strings, non-standard naming of things in bundles, etc.
7 files changed