Linkage done!

Finished component linkage, minor renames