Rename marco + ivan by tomi and lola