Revert "New class name with appcompat"

This reverts commit ac6b65982b439176a26ea0bd733abef2865e5e1e.

reverting the appcompat commit