Cleanup & renames, N-Triple output