Add a vector generator and fix namings.