[7636] Change naming scheme used by feature test macros.

[7636] Change naming scheme used by feature test macros. #194