Minor change to accomodate renames