Add version suffix and generalize easyconfig
Fix conflicts