refactored packaging naming