fix some nameing errors