Rename mail classes