Rename typename to class