fixed generic naming to work properly