changedNames ... again

Some More Minor Name-Changes