Fix naming bug 2/2.