Big refactoring + adjustation de la terminologie