Remove deprecated items, update filenames