Could you use \name instead of @name, to be consistent with the used syntax convention?. The same applies to other occurrences of @commands