Bug fix in naming from previous commit