Simplify name and alias annotation processing
37 files changed