Implement single naming

Closes #13