fix data structure file name to avoid namespace conflict