More renaming.
compiles and links.
Ready to test.