Simplified accounting entity package names to remove accounting segment so that most are 3 segments instead of 4