update everything to naming conventions agreed upon in class last week