Change a few names and tidy up dynamic loading