Prefixing private attribute to avoid name collisions
Merged devel
Fixed name conflicts from merge