Renamed variables and methods to reference entities.