Migrate to c namespace