Fixes some name references.