further adjusted packages naming convention