Revert "Updates following rename of PropertyBuffer"