Better naming

Minor tweaks.