[CORE-15] Working on configurations
[CORE-16] Renaming
[fixed CORE-16] Renaming