Renaming methods to make testing locally easier; resolves #424.