Fixed some more bad naming
Fixed