docs and eg moves to use standard naming pattern