Fixed naming error from merge