lib: Avoid using C++ keywords as variable names in header files.

Otherwise C++ programs can't #include the headers.

Signed-off-by: Amit Bose <bose@noironetworks.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>