clean up, rename members still using attribute path instead of attribute
path instance