Updated variable names according to convention