We do have a general problem through about naming collisions (within a course) due to the _ replacement. We have a story for this-- https://edx-wiki.atlassian.net/browse/STUD-776. 

Does this PR also address https://edx-wiki.atlassian.net/browse/STUD-1197?