More swapouts of ePortfolio/Portfolio. See #933