more verbose type names
keep up with cross-build changes