more working renaming/reference tracking