Updated versions and names, yay!