Rename the servlets. I didn't like the previous names.