fixing some old filenames/imports/etc