renamed more stuff to avoid List namespace conflicts