Adding missing typename keywords