Fix naming bug 1/2.