Naming convention updates (Not fully updated).
Naming conventions updated (Not fully implemented).