changed names to follow hw convention