Fixing some trj_ prefix stuff, everything should work now.