Correction to properly recognize similar @@ names