Properly uses names (Closes #1192).