naming fixes
Added configuration entries