Small changes before name change.