Fov handle, sometimes gets left in the name

[Chrissstrahl]

The fov handle is sometimes left in the name.
The reason is unknown.

Name is then: "abc ,196"
Instead of: "abc"

[Chrissstrahl]

Fixed, rewrote all related functions