fix several class/struct mismatches

This commit fixes several instances of classes being called structs or
structs being called classes in variable declarations.