bug #936, patch 1/3: some cleanup and renaming for consistency.
3 files changed