tidy up naming conventions