more logging & naming fixes