Update nomenclature in tests too...
Merge bug25904 again