more naming consistency fixes, adding in new naming conventions doc