Name change, more comments