fix name collision issues
1 file changed