Re #1709 Removed portal name references
Re 1709 Merged frontend changes