get rid of generic naming