Some renaming.
Consequences of da7d910.
Avoid memory leaks.