Fix various names