Updating to new choco conventions