changes as discussed, including ocd-division rename