Fix reference naming
6 files changed