Fixed commenting issues to reference current naming