fixing bad naming convention