Removing dependence on constructor name.
Fixing setup script on Linux. May break OSX.