Restructured for free naming of vector layer