Moving into bundle namespace to prevent confusion