rename objects, fix some logging