ironed out naming bugs