native framework updates
fix naming conflict, update framework