Fix names and broken references.