Update to naming and some documentation.