some macro and table renaming to make things clearer