BVAL-378 Aligning executable type names