Improve name collision check
1.1.8