Rename instance variable files
Add good example for primitive wrapping