Dynamic Variables in Session & Group/Folder Information

Good Afternoon,
Firstly thanks for the great product. It's been a life changer for me to centralise all of the information about our infrastructure & systems. The way we've got it setup it's almost a fully fledged CMDB.
I am in the process of redefining the organisational structure for our IT Department Data Source and I am using variables to make my life easier. (see "Domain_Name.jpg" and "Site_Name.jpg")
They appear to be working as expected When I open/execute a session, however when looking at the dashboard or information footer for a group/folder or a session the variable names are showing (e.g. $DOMAIN_NAME$) instead of resolving to the text I typed into the "Name" text box in the domain type group/folder further up the hierarchy. (see "Server_Info.jpg")
I tested that the variable resolves properly by using the parrot.bat example from online help.
And if a right click on a group/folder and select view then the variables resolve to the correct value I expected. (see "Server_View.jpg")
Is this by design? Am I doing something wrong? Is there some setting on my client I need to change to get this to happen? Or have I stumbled across a bug?
Regards,
Byron Edmonds