Naming config fixed, with integration tests