changed variable names to conventioned type