- Fix file name
- Cleanup AttributeSet