added non typedefed names