Changed type names.