Usage improvements

Naming and doc stuff.