Fixed keyword 'type' conflict