Fix various name problems