Fixed variable names

Fixed variable names so they use proper naming convention