Tidied up naming scheme

Signed-off-by: David Flindall <david@juxprose.com>
Tidied up naming scheme

Signed-off-by: David Flindall <david@juxprose.com>