Use correct index and type name