Fixing naming conflicts in various data structures