added fixes for configuration naming