Update to naming convention and toc.