Standardized naming conventions. Closes #31.