Updated vars & methods with new name