Perfect opportunity to tidy old hacky code ;) Replace `__unicode__` with `name`.