Fix some lingering name problems