Switching to Liquid's standard naming convention

Closes issue #900.