addressed Radu's issues
reversed rename