Removed the Base suffix from the augmentor classes.