Update Naming conventions and Docs
updated idea of @zbarahal’s PR (PR #20) to reflect the current master.