Renamed variables to betther align with convention.