Replace static privates by privates