Some minor compat changes.
The renamaning. Better to do this now than later.