More renames as suggested by @elemoine.