Changing naming ot temporarily support cqjcr