Use f.name more consistently and not some var that points to f.name