Prefix and macro name issues resolved

@thiagodefreitas: please review