More generalisation of organisation names in control panel pages