fix naming conflicts.