Changed rules to follow naming convention