Fix autowire to be non-destructive
Add TODO reminder to rename