Clean configuration

Warning : Some configuration constant names have changed