More work on translation
Default order for software model is changed to Name