Various small naming improvements.