Detect all vars
Make names better