fix naming bugs