Form.cfc and cf_form custom tag conflict

I created a new cfc yesterday labeled form.cfc and it appears to be causing
problems because i also have a custom tag labeled form.cfm . Is there an
easy way to resolve this conflict or should i just rename one of them?