Add in privacy guards and rename osd classes