Use more accurate names for decree form variables