Multiple changes to naming for 1.0rc2 update.