Changed terminology
Removed comments
More terminology changes