Changed less variable names