[Neil/Tunji] Change searchfields to camel case.