Fixed some accidentally wrong renamings.
Also, adapted some tests to the new names