Update to using new Mojang Ids.
A few small changes related to the above.