Merge pull request #184 from murrekatt/develop

Rename basket classes to not have OT prefix.