quick changes to naming