Renaming in install directory -- improves clarity.
Renaming in setup for clarity as well.