Made variable names consistant