Clean up Hearsay specific aliases