Add general_ suffix to var names