Add the naming section, minor tweaks.