Improved naming conventions
Updated phpDocs