I attempted to fix this in this PR but this PR created new renamed files and changed all references to use the new names, but still kept the old name-clashing files in the repo. A second PR here removes the old files, which should actually resolve this issue. cc @AllenDowney