Added name type
Added name + legal