changes for standard package naming
changes for standard package naming