Change some variable names/comments