Rename a few symbols for coherence
Remove dead code