Tidied up naming