Replace uses of deprecated BeanProperty with new namespace