Update nomenclature in tests too...