Fix autoloading and better internal naming..

using data as the internal variable resulted in issues when trying to use:
```
property :data
```

The update is a better approach to internal variable naming..