This fixes the problems Warner's having with ctors not being called again with the latest round of ld changes and updates the file-names to what Paul is using now. The name change will not affect anything as we are not (yet) using it.
