Tidier name handling.

Signed-off-by: Ben McIlwain <bmcilwain@ngpvan.com>