Fix name collision issue
Bump version