Refactor naming and fix the order function
Bump version