enhance var names