Changed type names