Fixed variable auto-naming
Reverted to one-variable rules