Changed names Portal -> PortalInternal, PortalWrapper -> Portal