Rename elem structure to resolve some conflicts