fixing bad naming