Make type names to be more generic