SOAP WAR Generation - Changing Default Context Name Uses Wrong Name for Service

When changing the default service name in the WAR generation wizard, the name is changed everywhere except the generated service class which uses the default value (VDB name). This causes a deployment error.