Tidy up

Rename for consistency