Bug fix in naming