fixed old naming errors