Rename types and aspectj link
4 files changed