Updated enums and naming properties in ConfigurationSolver