Dynamic naming bug fixed