Fixed patch naming to match conventions