Rename base class, fix case sensitivity issue, clean up XML config