changed naming to something more suitable