Fix: All annotations that rely on matching to a variable name need to have a specific name set