Fix naming convention

I believe it is ready. It passes all my tests. I changed the docs as well. Please run your own tests and check over the documents.