Support NAME type

Preparation for extension type support