Rollmat fix

Previous fix not savegame compatible. "rollmat" is now used everywhere, to reduce errors with spaces & underscores.