Fix stupid names.