Some minor (and final) changes of the names.