naming conventions updated