Changed two macro names.