changed type names