Added new rules to naming convention