Review by Roger plus overall naming improvements.
5 files changed