BVAL-378 Aligning executable type names; Removing some obsolete TODOs; F...

...ixing company name