TRIVIAL support for more conventional package filenames