Tweaks based on presentation.
Naming.