Package naming update