Update constant naming to prevent conflicts
Updates for release v0.2.0
Update for development 0.2.1