Change *_var/ to *_vars/ (to comply with Best Practices)