Naming bug fixed