__NAME__ and __TARGET__ may now be used in any command