Replaced `@name` with `@class_name` inside macros. And: instance vars inside macros don't have the `@` in their name anymore.