more naming fixes, added verbose setting