Some naming bugs fixed.