Fix regression introduced by naming convention in code cleanup.