Renamed some classes and fixed some 'VerticesUpdate'-problems