Update handling for alias of some variable to support multiple aliases
Update handling for alias of some variable to support auto-insert into correct location with real variable name