Fix bug in naming