Fix name collision
Preparing release 0.8.5
Back to development: 0.8.6