Original NOVAS files renamed (includes fixed): * -> NOVAS_*