fixed config problem identified in integration tests
fixed issue with naming at the end