Use 'pkg' in all situations now