Use name given to command block instead of "@". Fixes BUKKIT-3803