Tidied up some terminology