Fixed bad class naming. Closes #532