Rename namespace
Refactor body/analyze to report map from symbols to vars