Rename email + rules fix