fixed bad naming scheme