minor naming bugs fixed