apply some name corrections