Rename of method to respect adaptor naming conventions, cleanup, and minor steps toward test data.