some fixes on matching reserved names and updating index.html