fixed naming bugs