rename servlet classes

Change-Id: Ie04a7e2ad0fc0c3e43e12104154fa4f38c0d133c