Renaming.
Minor improvements.