Fix a few naming issues