More renames

...suggested by @elemoine.