Adding more missing typename keywords