Rollback package renaming until we can split this up into two repos