update for some macro renamings