Bump to 0.2.5 - fix a few lingering naming issues