Bug fix in naming
Bug fix in naming