changed macro names