Fixed up per-object naming convention to be "filename_prefix"+"_"+"object_name".