Tidying up name