Update references to 2.5
20 files changed