Rename base form to correct filename