drop middleware suffix in class names

as discussed in bp, we should drop the middleware suffix in class
names to avoid redundancy.

Change-Id: I60e1e84e817e24be9ad1d31381df95c93f7b7990
Merge "drop middleware suffix in class names"