Merge "change the entry file name to be equal of package name"