Added if statement to force naming convention