fixed bugs with bad naming