AVALANCHE: Enid: replace namespace with class.