Rename CircleLock specific classes