Changed internal macro names used as they conflicted with ones added to portal-library.vm