Fix redundant variable names