Make CBLiteEktorp compatible with master branch after renaming things to remove CBL prefix.