Use only the file name from the supplied prefix for backward compatibility Reviewed-by: alanb, chegar