MP: put everything in a proper namespace