Small updates, name changes