fixed naming conflict and some README updates