Fix various naming issues