Fixed compile errors introduced in r395954.

Just a merge error due to a file rename. Grrr...


git-svn-id: http://svn.asterisk.org/svn/asterisk/trunk@395971 f38db490-d61c-443f-a65b-d21fe96a405b