Names refactoring.

Closes #4.