Rename base class
Merge branch 'release/1.1.-3'