Made ADT names more precise