tidy up names

Signed-off-by: beccawilson <rebecca.c.wilson@gmail.com>