Fixing name bugs, readding Naquadah Generators.

Manually merged in all previous commits.