Follow variable name change