minor improvement to handle naming conflicts