Simplify naming controller/action convention

Closes #28