Cleanup some naming bugs