AVALANCHE: Pingo: replace namespace with class.