Commit to include name changes 16-12-2014