Amended a few comments to refer to current naming/terms