Lots of cleanup/renaming in the asset loading pipeline