Rename
Cleanup VectorImage