Name fix.
Move code into vsite.inc