Finally get rid of the C style vector, rename the template class to its proper name
This reverts commit 675d6d83.