Fix remaining occurences of old name