Name conventions updated