DELTASPIKE-537 cleanup (header + typo in names)