edge cases, and handling name changes