Fix Rename bug due on entity/time clashes

My bad. :(
> Can we rename .ns to be feature index or something, bit confusing as it stands.

Yep. Done.