Team membership lost on change of player name

When a player who is a member of a team changes his/her minecraft name, he/she will no longer be a member of said team, and

/team list <Team name>

will still show the old player name as a member. The problem seems to be that the team membership is based on the name of a player instead of the UUID.