Properly support origin as package name