2013-Spring: Fix name duplicates due to typos