Re-add bensteresteb and change naming style