Changed name to Type