Fixed const typedef semantic silliness
Argument names now consistent