Fixed possible duplicate commitment ID bug

Refactored packages name