Another naming fix