Fix naming bugs