Remove same name for two different methods
Unify naming of ostream variables