changed xx macro names