Incorporated the naming convention and validation condition changes