Changed variable names to comply with naming convention