Rename and change refs for property aggregates to annotations