Add document, fix naming convention