updated some naming schemes and removed an outdated comment.