Removed comment & unified naming.