fix names so maps work