Updated NPortlet to use the latest class names