fixed more naming bugs