Rename, add pulling from wiki.