Another name refactoring, so parsing modules are consistent.