minor renaming
Merge branch '2013-14-Data-Model' into 2012-13-Pilot