rename variable and change back the name used for model registration