correct variables names (happend when broke up single method)