bug fixed in naming