Renamed vars into common_vars