tidied up the naming scheme