The todo should be to refactor wiki naming to something more in line w/ having opaque keys which may or may not provide the fields the wiki name currently uses.