changed canvas variable name and canvas class name to Andy's coding standards.