Fixed mismatched macro names