Renaming that I missed first time 'round, plus changes to makefiles etc so it builds now.