A clarification
More sensible module name, and a bugfix