Renamed some stuff in vector class as an experiment