Clean up naming

This applies some clean up on top of #24