Refactor to use normalized type names.
Refactor to use normalized type names.