Some more renaming

Now builds (no linkage though)