Rename.

Minor simplification and cleanup as well.
Gemspec tweaks