Variable name changes, non-synthesizable recipes

With help from MandrakeF.